* debian/compat:

  - debhelper compat level set to 5
* debian/changelog: 
  - merged the changelog from the NMU
* debian/control:
  - merged the changes from the NMU
  - set standards version to 3.6.2.0
* debian/rules:
  - fix arch-build target
* setup.py: 
  - simplify the patch magling by using map() instead of "for i in range()"

5 files changed, 24 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 976e078f..e1dfd27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.6.16.2) unstable; urgency=low
+python-apt (0.6.17) unstable; urgency=low
 
   * apt/progress.py: 
     - initialize FetchProgress.eta with the correct type
@@ -19,8 +19,17 @@ python-apt (0.6.16.2) unstable; urgency=low
   * python/indexfile.cc:
     - added ArchiveURI() method
   
- -- 
+ --
 
+python-apt (0.6.16.2) unstable; urgency=low
+  
+  * Non-maintainer upload.
+  * debian/control:
+    + Replaces: python-apt (<< 0.6.11), instead of Conflicts which is not
+      correct here. (closes: #308586).
+
+ -- Pierre Habouzit <madcoder@debian.org>  Fri, 14 Apr 2006 19:30:51 +0200
+  
 python-apt (0.6.16.1) unstable; urgency=low
 
   * memleak fixed when pkgCache objects are deallocated
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 bfa67c67..6966077f 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, python2.3-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, python2.3-dev
 
 Package: python-apt
 Architecture: all
@@ -23,7 +23,7 @@ Description: Python interface to libapt-pkg
 Package: python2.3-apt
 Architecture: any
 Depends: python2.3, ${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 
@@ -38,7 +38,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 0ab6fa27..584abdf5 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)
 
@@ -83,7 +80,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
diff --git a/setup.py b/setup.py
index f9255607..5adb0376 100644
--- a/setup.py
+++ b/setup.py
@@ -7,22 +7,18 @@ import string, glob
 
 
 # The apt_pkg module
-files = string.split(parse_makefile("python/makefile")["APT_PKG_SRC"]);
-for i in range(0,len(files)):
-    files[i] = "python/"+ files[i];
-apt_pkg = Extension("apt_pkg", files,
-		libraries=["apt-pkg"]);
+files = map(lambda source: "python/"+source,
+            string.split(parse_makefile("python/makefile")["APT_PKG_SRC"]))
+apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"]);
 
 # The apt_inst module
-files = string.split(parse_makefile("python/makefile")["APT_INST_SRC"]);
-for i in range(0,len(files)):
-    files[i] = "python/"+ files[i];
-apt_inst = Extension("apt_inst", files,
-		libraries=["apt-pkg","apt-inst"]);
+files = map(lambda source: "python/"+source,
+            string.split(parse_makefile("python/makefile")["APT_INST_SRC"]))
+apt_inst = Extension("apt_inst", files, libraries=["apt-pkg","apt-inst"]);
 
 
 setup(name="python-apt", 
-      version="0.6.13",
+      version="0.6.17",
       description="Python bindings for APT",
       author="APT Development Team",
       author_email="deity@lists.debian.org",