* merged r192 from mainline

4 files changed, 13 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 567ef8e9..b02c3917 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-apt (0.6.16.2ubuntu6) unstable; urgency=low
+
+  * debian/control:
+    + Replaces: python-apt (<< 0.6.11), instead of Conflicts which is not
+      correct here. (closes: #308586).
+  
+ -- 
+
 python-apt (0.6.16.2ubuntu5) dapper; urgency=low
 
   * apt/cache.py: Release locks on failure (thanks to Colin Watson)
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..7813681f
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 350d08e0..e8d0038c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: python
 Priority: optional
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.1.1
-Build-Depends: debhelper (>= 4.2.28), libapt-pkg-dev (>= 0.6.40), apt-utils, python-dev, python2.4-dev
+Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>= 5.0), libapt-pkg-dev (>= 0.6.40), apt-utils, python-dev, python2.4-dev
 
 Package: python-apt
 Architecture: all
@@ -23,7 +23,7 @@ Description: Python interface to libapt-pkg
 Package: python2.4-apt
 Architecture: any
 Depends: python2.4, ${shlibs:Depends}
-Conflicts: python-apt (<< 0.6.11)
+Replaces: python-apt (<< 0.6.11)
 Priority: optional
 Description: Python interface to libapt-pkg
  The apt-pkg Python interface will provide full access to the internal 
diff --git a/debian/rules b/debian/rules
index 9439a2c9..c71baf08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
 DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
@@ -84,7 +81,7 @@ source diff:
 arch-build:
 	rm -rf debian/arch-build
 	mkdir -p debian/arch-build/python-apt-$(DEBVER)
-	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/python-apt-$(DEBVER)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/python-apt-$(DEBVER);tar xf -)
 	(cd debian/arch-build/python-apt-$(DEBVER); $(DEB_BUILD_PROG))
 
 binary: binary-indep binary-arch