* merged with mainline

4 files changed, 85 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index ad6bc8d8..467341a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,64 @@
+=======
+python-apt (0.6.19) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * doc/examples/print_uris.py:
+    - added a example to show how the indexfile.ArchiveURI() can be used
+      with binary packages
+  * python/apt_pkgmodule.cc:
+    - export sha256 generation
+
+  [ Otavio Salvador ]
+  * apt/cache.py:
+    - fix commit doc string to also cite the open related callbacks
+    - allow change of rootdir for APT database loading
+    - add dh_installexamples in package building Closes: #376014
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 26 Jul 2006 18:51:56 +0200
+
+python-apt (0.6.18-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add ${shlibs:Depends} and ${misc:Depends} (Closes: #377615).
+
+ -- Christoph Berg <myon@debian.org>  Tue, 18 Jul 2006 11:39:52 +0200
+
+python-apt (0.6.18-0.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Call dh_pycentral and dh_python before dh_installdeb, to make sure
+    the dh_pycentral snippets are put into the maintainer scripts; patch from
+    Sam Morris. (Closes: #376416)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 12 Jul 2006 23:26:50 +0200
+
+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/cache.py:
+    - return useful values on Cache.update()
+    - Release locks on failure (thanks to Colin Watson)
+    - fix various pychecker warnings
+  * apt/package.py: 
+    - fix various pychecker warnings
+    - check if looupRecords succeeded
+    - fix bug in the return statement of _downloadable()
+  * python/srcrecords.cc:
+    - add "Restart" method
+    - don't run auto "Restart" before performing a Lookup 
+    - fix the initalization (no need to pass a PkgCacheType to the records)
+    - added "Index" attribute
+  * python/indexfile.cc:
+    - added ArchiveURI() method
+  
+ -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:34:58 +0200
+
 python-apt (0.6.16.2ubuntu9) edgy; urgency=low
 
   * rebuild against the latest apt (with auto-mark support)
@@ -75,6 +136,15 @@ python-apt (0.6.16.2ubuntu1) dapper; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 12:04:37 +0100
 
+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
 
   * typos fixed (thanks to Gustavo Franco)
diff --git a/debian/control b/debian/control
index 4f5f3019..c057feed 100644
--- a/debian/control
+++ b/debian/control
@@ -4,27 +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.44.2), apt-utils, python-dev, python2.4-dev
+XS-Python-Version: all
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.44.2), 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.4-apt
 Architecture: any
-Depends: python2.4, ${shlibs:Depends}
-Replaces: python-apt (<< 0.6.11)
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc: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/examples b/debian/examples
new file mode 100644
index 00000000..80a386c8
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+doc/examples/*.py
diff --git a/debian/rules b/debian/rules
index c71baf08..ee159b89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +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=python2.4
+PYTHON=$(shell pyversions -r debian/control)
 
 build: build-stamp
 build-stamp:
@@ -39,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
@@ -58,19 +45,21 @@ 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_installexamples
+	dh_pycentral
+	dh_python
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_python
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb