merge stable back into default

__pkginfo__.py

@@ -19,8 +19,8 @@ classifiers = [
     'Programming Language :: JavaScript',
     ]
 
-__depends__ = {'cubicweb': '>= 3.10.0',
-               'python-crypto': None,
+__depends__ = {'cubicweb': '>= 3.15.0',
+               'pycrypto': None,
                'PIL': None,
                }
 

debian/compat

-5
+7

debian/control

@@ -2,13 +2,19 @@ Source: cubicweb-registration
 Section: web
 Priority: optional
 Maintainer: Logilab Packaging Team <contact@logilab.fr>
-Build-Depends: debhelper (>= 5.0.37.1), python (>=2.4), python-dev (>=2.4)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), python (>= 2.6), python-support
+Standards-Version: 3.9.3
 Homepage: http://www.cubicweb.org/project/cubicweb-registration
+XS-Python-Version: >= 2.6
 
 Package: cubicweb-registration
 Architecture: all
-Depends: cubicweb-common (>= 3.10.0), python-crypto, python-imaging
+Depends:
+ cubicweb-common (>= 3.15.0),
+ python-crypto,
+ python-imaging,
+ ${python:Depends},
+ ${misc:Depends},
 Description: public registration component for the CubicWeb framework
  This CubicWeb component provides a public registration feature (users
  can register and create an account without the need for admin

debian/cubicweb-registration.prerm

-#!/bin/sh -e
-
-delete_pyo_pyc () {
-  find /usr/share/cubicweb/cubes/registration -name "*.pyc" | xargs rm -f
-  find /usr/share/cubicweb/cubes/registration -name "*.pyo" | xargs rm -f
-}
-
-
-case "$1" in
-    failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-    upgrade)
-    delete_pyo_pyc
-    ;;
-    remove)
-    delete_pyo_pyc
-    ;;
-    purge)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-#DEBHELPER#

debian/rules

@@ -4,18 +4,21 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-build: build-stamp
+build: build-arch build-indep
+build-arch:
+	# Nothing to do
+
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
 	NO_SETUPTOOLS=1 python setup.py -q build
-	touch build-stamp
+	>$@
 
 clean:
 	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp
 	rm -rf build
-	find . -name "*.pyc" | xargs rm -f
+	find . -name "*.pyc" -delete
 	dh_clean
 
 install: build
@@ -24,7 +27,8 @@ install: build
 	dh_clean -k
 	dh_installdirs -i
 	NO_SETUPTOOLS=1 python setup.py -q install --no-compile --prefix=debian/cubicweb-registration/usr/
-
+	# remove generated .egg-info file
+	rm -rf debian/cubicweb-registration/usr/lib/python*
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -35,6 +39,7 @@ binary-indep: build install
 	dh_installexamples -i
 	dh_installdocs -i
 	dh_installman -i
+	dh_pysupport -i /usr/share/cubicweb
 	dh_link -i
 	dh_compress -i -X.py -X.ini -X.xml -Xtest
 	dh_fixperms -i

views.py

@@ -13,7 +13,7 @@ from yams.schema import role_name
 
 from cubicweb import mail, crypto
 from cubicweb.view import StartupView
-from cubicweb.selectors import anonymous_user
+from cubicweb.predicates import anonymous_user
 from cubicweb.web import Redirect, ValidationError, ProcessFormError
 from cubicweb.web import controller, form, captcha
 from cubicweb.web import formwidgets as fw, formfields as ff