* merging the NMU changes

3 files changed, 20 insertions, 49 deletions

diff --git a/debian/changelog b/debian/changelog
index 287605e0..d9b428bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.6.18) unstable; urgency=low
+python-apt (0.6.19) unstable; urgency=low
 
   [ Michael Vogt ]
   * doc/examples/print_uris.py:
@@ -12,6 +12,13 @@ python-apt (0.6.18) unstable; urgency=low
   
  -- 
 
+python-apt (0.6.18) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update for the new Python policy. Closes: #373512
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat, 17 Jun 2006 15:09:28 +0200
+
 python-apt (0.6.17) unstable; urgency=low
 
   * apt/progress.py: 
diff --git a/debian/control b/debian/control
index 6966077f..f313dff5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,42 +4,17 @@ 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.2.0
-Build-Depends: debhelper (>= 5.0), libapt-pkg-dev (>= 0.6.40), apt-utils, python-dev, python2.4-dev, python2.3-dev
+XS-Python-Version: all
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.40), apt-utils, python-all-dev, python-central
 
 Package: python-apt
-Architecture: all
-Depends: ${python:Depends}
-Priority: optional
-Description: Python interface to libapt-pkg
- The apt-pkg Python interface will provide full access to the internal 
- libapt-pkg structures allowing Python programs to easily perform a
- variety of functions, such as:
- .
-  - Access to the APT configuration system
-  - Access to the APT package information database
-  - Parsing of Debian package control files, and other files with a
-    similar structure
-
-Package: python2.3-apt
 Architecture: any
-Depends: python2.3, ${shlibs:Depends}
-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 
- libapt-pkg structures allowing Python programs to easily perform a
- variety of functions, such as:
- .
-  - Access to the APT configuration system
-  - Access to the APT package information database
-  - Parsing of Debian package control files, and other files with a
-    similar structure
-
-Package: python2.4-apt
-Architecture: any
-Depends: python2.4, ${shlibs:Depends}
-Replaces: python-apt (<< 0.6.11)
+Depends: ${python:Depends}
 Priority: optional
+Replaces: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
+Conflicts: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt-pkg Python interface will provide full access to the internal 
  libapt-pkg structures allowing Python programs to easily perform a
diff --git a/debian/rules b/debian/rules
index 584abdf5..ffd39a6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYTHON=python2.3 python2.4
+PYTHON=$(shell pyversions -r debian/control)
 
 build: build-stamp
 build-stamp:
@@ -38,18 +38,6 @@ clean:
 # Build architecture-independent files here.
 binary-indep: DH_OPTIONS=-i
 binary-indep: build
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples doc/examples/*.py
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_python
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 # Build architecture-dependent files here.
 binary-arch: DH_OPTIONS=-a
@@ -57,11 +45,11 @@ binary-arch: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
+	
 	for PY in $(PYTHON); do \
-		/usr/bin/$$PY setup.py install --prefix=`pwd`/debian/$${PY}-apt/usr; \
+		/usr/bin/$$PY setup.py install --prefix=`pwd`/debian/python-apt/usr; \
 	done
-
+	
 	dh_installdocs
 	dh_installchangelogs
 	dh_strip
@@ -69,6 +57,7 @@ binary-arch: build
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+	dh_pycentral
 	dh_python
 	dh_gencontrol
 	dh_md5sums