Use debhelper 7 instead of CDBS

7 files changed, 28 insertions, 44 deletions

diff --git a/debian/changelog b/debian/changelog
index 298c0ac6..2c27b23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.7.11.2) unstable; urgency=low
+python-apt (0.7.12.0) unstable; urgency=low
 
   [ Julian Andres Klode ]
   * python/cache.cc:
@@ -18,6 +18,7 @@ python-apt (0.7.11.2) unstable; urgency=low
     - Allow to set the candidate of a package (Closes: #523997)
       + Support assignments to the 'candidate' property of Package objects.
       + Initial patch by Sebastian Heinlein
+  * Use debhelper 7 instead of CDBS
 
   [ Stefano Zacchiroli ]
   * debian/python-apt.doc-base: register the documentation with the
diff --git a/debian/compat b/debian/compat
index 7ed6ff82..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 83b2e421..1d3a9dd3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.2
 XS-Python-Version: all
 Build-Depends: apt-utils,
-               cdbs,
-               debhelper (>= 5.0.37.1),
+               debhelper (>= 7.3.5),
                libapt-pkg-dev (>= 0.7.22~),
-               python-all-dbg,
-               python-all-dev,
+               python-all-dbg (>= 2.5.4-1),
+               python-all-dev (>= 2.5.4-1),
                python-central (>= 0.5),
                python-debian,
                python-distutils-extra (>= 1.9.0),
diff --git a/debian/python-apt-dbg.install b/debian/python-apt-dbg.install
new file mode 100644
index 00000000..1bbba721
--- /dev/null
+++ b/debian/python-apt-dbg.install
@@ -0,0 +1 @@
+usr/lib/python*/*/*_d.so
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 6ba083f5..177b5837 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -1,4 +1,6 @@
 README
+AUTHORS
+TODO
 apt/README.apt
 data/templates/README.templates
 build/doc/html/
diff --git a/debian/python-apt.install b/debian/python-apt.install
index 4910e8ed..ca86ed11 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -1,3 +1,6 @@
-debian/tmp/usr/lib/python*
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/python-apt
+usr/lib/python*/*/apt_pkg.so
+usr/lib/python*/*/apt_inst.so
+usr/lib/python*/*/*/
+usr/lib/python*/*/*.egg-info
+usr/share/locale
+usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 6d709ecd..6e2204cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,20 @@
 #!/usr/bin/make -f
-
-DEB_AUTO_CLEANUP_RCS := yes
-DEB_PYTHON_SYSTEM=pycentral
-
 export DH_PYCENTRAL=nomove
+export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+export CFLAGS=-Wno-write-strings
 
-DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
-
-# Add here any variable or target overrides you need
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-PKG=python-apt
-DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
-DEB_COMPRESS_EXCLUDE:=.html .js _static/* _sources/* _sources/*/* .inv
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
-export DEBVER
-
-build/python-apt-dbg::
-	set -e; \
-	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py build; \
-	done
-
-install/python-apt-dbg::
-	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \
-	done
-	find debian/python-apt-dbg \
-		! -type d ! -name '*_d.so' | xargs rm -f
-	find debian/python-apt-dbg -depth -empty -exec rmdir {} \;
-
-binary-predeb/python-apt::
-	ln -sf ../../../../javascript/jquery/jquery.js debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
+%:
+	dh --with python-central $@
 
-binary-predeb/python-apt-dbg::
+override_dh_installdocs:
+	dh_installdocs
+	ln -sf ../../../../javascript/jquery/jquery.js \
+	       debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
 	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
 	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
 
-clean::
-	rm -rf build/lib* build/temp*
+override_dh_strip:
+	dh_strip --dbg-package=python-apt-dbg
+	
+override_dh_compress:
+	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv