merged from the debian-sid branch

5 files changed, 18 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index b6c1945f..8b5f439b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,11 +23,14 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low
     - Fix mixed tab/spaces indentation in xz test
   * tests/test_apt_cache.py:
     - Package records 'Package' field now corresponds to shortname
+  * debian/python3-apt-dbg.install
+    - Do not try to install old-style debugging files.
+  * debian/rules:
+    - Support the nocheck build option and ignore test failures on hurd
+      (Closes: #610448)
+    - Move Python 3 debug files before installing other files (Closes: #619528)
 
   [ Scott Kitterman ]
-   * Override override_dh_auto_install to install python3 extensions in the
-     correct locations (Closes: #619528)
-     - Drop .so files from python3-apt.install
    * Removed ${python:Breaks} - No longer used in dh_python2
 
  -- Julian Andres Klode <jak@debian.org>  Mon, 04 Apr 2011 09:48:10 +0200
diff --git a/debian/python3-apt-dbg.files b/debian/python3-apt-dbg.files
new file mode 100644
index 00000000..88cbfcb0
--- /dev/null
+++ b/debian/python3-apt-dbg.files
@@ -0,0 +1 @@
+usr/lib/python3*/*/*d*.so
diff --git a/debian/python3-apt-dbg.install b/debian/python3-apt-dbg.install
deleted file mode 100644
index 011ab164..00000000
--- a/debian/python3-apt-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*/*/*_d.so
diff --git a/debian/python3-apt.install b/debian/python3-apt.install
index 6335f751..352d102b 100644
--- a/debian/python3-apt.install
+++ b/debian/python3-apt.install
@@ -1,2 +1,4 @@
+usr/lib/python3*/*/apt_pkg*.so
+usr/lib/python3*/*/apt_inst*.so
 usr/lib/python3*/*/*/
 usr/lib/python3*/*/*.egg-info
diff --git a/debian/rules b/debian/rules
index d020e901..5428375d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,9 @@ export SHELL = env PATH=$(PATH) sh
 override_dh_auto_build:
 	dh_auto_build
 
-override_dh_auto_install:
-	for i in $(shell py3versions -r); do \
-	  $$i ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-apt; \
-	done
-	for i in $(shell py3versions -r); do \
-          $$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-apt-dbg; \
-        done
-	dh_auto_install
+override_dh_install:
+	dh_movefiles
+	dh_install
 
 override_dh_installdocs:
 	set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
@@ -37,10 +32,15 @@ override_dh_strip:
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
 
+# We ignore failures on hurd, since its locking is broken
 override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	set -e; for python in $(shell pyversions -r); do \
-		$$python tests/test_all.py -q; \
+		$$python tests/test_all.py -q || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ]; \
 	done;
+else
+	@echo "** tests disabled"
+endif
 
 override_dh_python2:
 	dh_python2 -N python-apt-common