merged from debian-sid

5 files changed, 56 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 6d79aef8..235a38da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+python-apt (0.7.100.3ubuntu1) natty; urgency=low
+
+  * merge fixes from debian-sid, most notably the fixes
+    to support multiarch (thanks to Julian Andres Klode)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Apr 2011 16:15:15 +0200
+
+python-apt (0.7.100.3) unstable; urgency=low
+
+  [ Barry Warsaw ]
+  * PyFetchProgress::Pulse(): When ignoring a false return value from
+    PyArg_Parse() after running the simple callback pulse(), there can be
+    an exception on the stack, which must be cleared.  (LP: #711225)
+
+  [ Michael Vogt ]
+  * python/arfile.cc, apt/debfile.py:
+    - add support for .xz archives
+  * tests/test_debfile.py:
+    - add test for xz compression
+  * update priority of python3-apt to match the archive
+
+  [ Julian Andres Klode ]
+  * python/cache.cc:
+    - Add Package.get_fullname() and Package.architecture
+  * apt/cache.py, apt/package.py:
+    - Add architecture property to apt.Package (LP: #703472)
+    - Change apt.Package.name to use get_fullname(pretty=True) (LP: #740072)
+  * tests/test_debfile.py:
+    - Disable multi-arch for the test, it fails when run via test_all.py
+    - 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 ]
+   * Removed ${python:Breaks} - No longer used in dh_python2
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 04 Apr 2011 12:52:03 +0200
+
 python-apt (0.7.100.2ubuntu4) natty; urgency=low
 
   * fix incorrect tab, this fixes a FTBFS
diff --git a/debian/control b/debian/control
index dbfe644f..7b052bfc 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Package: python-apt
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
 Recommends: lsb-release, iso-codes
-Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4), ${python:Breaks}
+Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
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/rules b/debian/rules
index a38b4605..5428375d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,10 @@ export SHELL = env PATH=$(PATH) sh
 override_dh_auto_build:
 	dh_auto_build
 
+override_dh_install:
+	dh_movefiles
+	dh_install
+
 override_dh_installdocs:
 	set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
 		python setup.py build_sphinx; \
@@ -28,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