merged from debian-sid

1 files changed, 8 insertions, 6 deletions

diff --git a/debian/rules b/debian/rules
index f7cca130..a38b4605 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 # Should be include-links, but that somehow fails.
-export DH_PYCENTRAL=nomove
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 export PATH :=$(CURDIR)/utils:$(PATH)
 export SHELL = env PATH=$(PATH) sh
 
 %:
-	dh --with python-central $@
+	dh --with python2,python3 $@
 
 override_dh_auto_build:
 	dh_auto_build
@@ -18,10 +17,13 @@ override_dh_installdocs:
 		dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \
 	fi
 	dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
-	dh_installdocs --link-doc=python-apt
+	dh_installdocs -Npython-apt-common -Npython3-apt -Npython3-apt-dbg --link-doc=python-apt
+	dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt
+	dh_installdocs -p python-apt-common
 
 override_dh_strip:
-	dh_strip --dbg-package=python-apt-dbg
+	dh_strip -p python-apt --dbg-package=python-apt-dbg
+	dh_strip -p python3-apt --dbg-package=python3-apt-dbg
 	
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
@@ -31,5 +33,5 @@ override_dh_auto_test:
 		$$python tests/test_all.py -q; \
 	done;
 
-override_dh_pycentral:
-	dh_pycentral --exclude=migrate-0.8.py
+override_dh_python2:
+	dh_python2 -N python-apt-common