--- a/debian/compat	Wed Jul 15 10:57:11 2015 +0200
+++ b/debian/compat	Wed Jul 15 10:55:38 2015 +0200
@@ -1,1 +1,1 @@
-5
+9

--- a/debian/control	Wed Jul 15 10:57:11 2015 +0200
+++ b/debian/control	Wed Jul 15 10:55:38 2015 +0200
@@ -3,25 +3,27 @@
 Priority: optional
 Maintainer: Logilab Packaging Team <contact@logilab.fr>
 Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-Build-Depends: debhelper (>= 5.0.37.1),
-               python-support,
-               python-all-dev (>=2.6),
-               libgecode-dev,
-               python-sphinx
-XS-Python-Version: >= 2.6
-Standards-Version: 3.9.1
+Build-Depends:
+ debhelper (>= 9),
+ python-all-dev (>= 2.6.5),
+ libgecode-dev,
+ python-sphinx,
+ python-setuptools,
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.6
 Homepage: http://www.logilab.org/project/rql
 
 Package: python-rql
 Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends},
-         python-logilab-common (>= 0.35.3-1),
-         yapps2-runtime,
-         python-logilab-database (>= 1.6.0),
-         python-six (>= 1.4.0),
+Depends:
+ ${python:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+ python-logilab-common (>= 0.35.3-1),
+ yapps2-runtime,
+ python-logilab-database (>= 1.6.0),
+ python-six (>= 1.4.0),
 Conflicts: cubicweb-common (<= 3.13.9)
-Provides: ${python:Provides}
 Suggests: python-pygments
 Description: relationship query language (RQL) utilities
  A library providing the base utilities to handle RQL queries,

--- a/debian/python-rql-test.dirs	Wed Jul 15 10:57:11 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-usr/share/doc/python-rql
-usr/share/doc/python-rql/test

--- a/debian/rules	Wed Jul 15 10:57:11 2015 +0200
+++ b/debian/rules	Wed Jul 15 10:55:38 2015 +0200
@@ -1,72 +1,10 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# adapted by Logilab for automatic generation by debianize
-# (part of the devtools project, http://www.logilab.org/projects/devtools)
-#
-# Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE).
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	for PYTHON in `pyversions -r`; do \
-	    RQL_FORCE_GECODE=1 NO_SETUPTOOLS=1 $${PYTHON} setup.py build || exit; done
-	$(MAKE) -C doc html || true
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -rf build
-	find . -name "*.pyc" | xargs rm -f
-	rm -f changelog.gz
-	dh_clean
+export RQL_FORCE_GECODE=1
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	for PYTHON in `pyversions -r`; do \
-		NO_SETUPTOOLS=1 $${PYTHON} setup.py install --no-compile --prefix=debian/python-rql/usr/ || exit; \
-	done
-	# remove test directory (installed in in the doc directory)
-	rm -rf debian/python-rql/usr/lib/python*/site-packages/rql/test
-	# install tests
-	cd test && find . -type f -not \( -name '*.pyc' \) -exec install -D --mode=644 {} ../debian/python-rql/usr/share/doc/python-rql/test/{} \;
-
-# Build architecture-independent files here.
-binary-indep:
+%:
+	dh $@ --with python2 --buildsystem python_distutils
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install -a
-	dh_pysupport -a
-	gzip -9 -c ChangeLog > changelog.gz
-	dh_installchangelogs -a
-	dh_installexamples -a
-	dh_installdocs -a README TODO changelog.gz
-	dh_installman -a
-	dh_link -a
-	# .js, .txt and .json are coming from sphinx build
-	dh_compress -a -X.py -X.ini -X.xml -Xtest/ -X.js -X.txt -X.json
-	dh_fixperms -a
-	dh_strip
-	dh_shlibdeps -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary binary-indep binary-arch
-
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C doc html