* merge with ubuntu

6 files changed, 336 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index cab337f6..760812e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,120 @@
-python-apt (0.6.21) unstable; urgency=low
+python-apt (0.6.20ubuntu14) feisty; urgency=low
+
+  * aptsources/distro.py:
+    - fix typo (LP#84009)
+  * fix gettext import (LP#92764)
+  * po/*.po:
+    - make update-po
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 22 Mar 2007 15:40:37 +0100
+
+python-apt (0.6.20ubuntu13) feisty; urgency=low
+
+  * fix in the duplicated source checking (thanks to Sebastian Heinlein)
+  * python/depache.cc:
+    - properly support isAutoInstalled flag
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 16:38:22 +0100
+
+python-apt (0.6.20ubuntu12) feisty; urgency=low
 
   * apt/cdrom.py:
-    - better cdrom handling support
-  * apt/package.py:
-    - added candidateDependencies, installedDependencies
-    - SizeToString supports PyLong too 
+    - fix bug in cdrom __init__ code
+  * debian/rules:
+    - added "DH_PYCENTRAL=nomove"
+
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Mar 2007 10:41:00 +0100
+
+python-apt (0.6.20ubuntu11) feisty; urgency=low
+
+  * apt/packages.py:
+    - support candidateDependencies, installedDependencies
     - support pkg.architecture
     - support candidateRecord, installedRecord
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Mar 2007 16:22:49 +0100
+
+python-apt (0.6.20ubuntu10) feisty; urgency=low
+
+  * debian/control:
+    - added XS-Vcs-Bzr header to make finding the repo easier
   * apt/cache.py:
-    - fix rootdir
+    - fix rootdir var
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Mar 2007 14:36:33 +0100
+
+python-apt (0.6.20ubuntu9) feisty; urgency=low
+
+  * Re-add debian/python-apt.install (LP: #88134)
+    - This seems to have gone missing between 0.6.20ubuntu6 and 0.6.20ubuntu8
+    - This probably happened because it wasn't added to bzr
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 26 Feb 2007 14:04:15 -0800
+
+python-apt (0.6.20ubuntu8) feisty; urgency=low
+
+  * fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 18:41:37 +0100
+
+python-apt (0.6.20ubuntu7) feisty; urgency=low
+
+  * aptsources/distro.py:
+    - fix crash in add_source (LP#85806)
+  * apt/package.py:
+    - handle invalid unicode more gracefully (LP#86215)
+  * rebuild against latest apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:31:00 +0100
+
+python-apt (0.6.20ubuntu6) feisty; urgency=low
+
+  * Build the extension for the debug interpreter.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Feb 2007 02:10:37 +0100
+
+python-apt (0.6.20ubuntu5) feisty; urgency=low
+
+  * be more robust in has_repository (LP#84897)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Feb 2007 17:49:55 +0100
+
+python-apt (0.6.20ubuntu4) feisty; urgency=low
+
+  * rebuild against latest libapt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 16:40:37 +0100
+
+python-apt (0.6.20ubuntu3) feisty; urgency=low
+
+  * fixes in the new 'aptsources' module 
+    (thanks to Sebastian Heinlein)
   * apt/cdrom.py:
-    - fix bug in cdrom mountpoint handling
+    - better cdrom handling support
+  * python/string.cc:
+    - SizeToString supports PyLong too 
+  * apt/cache.py:
+    - fix rootdir
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Feb 2007 10:29:55 +0100
+
+python-apt (0.6.20ubuntu2) feisty; urgency=low
+
+  * python/depcache.cc:
+    - MarkInstall() has new FromUser argument to support marking
+      packages as automatically installed
+  * merged the 'aptsources' module for sources.list handling 
+    (thanks to Sebastian Heinlein)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  2 Feb 2007 16:26:38 +0100
+
+python-apt (0.6.20ubuntu1) feisty; urgency=low
 
- --
+  * merged from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 13:41:32 +0100
 
 python-apt (0.6.20) unstable; urgency=low
 
@@ -39,10 +141,80 @@ python-apt (0.6.20) unstable; urgency=low
   * make it build against python2.5
   * python/progress.cc:
     - fix memleak (lp: #43096)
+  
+ --  Michael Vogt <mvo@debian.org>  Tue, 19 Dec 2006 13:32:11 +0100
+  
+python-apt (0.6.19ubuntu9.1) edgy-updates; urgency=low
+
+  * protect against not-parsable strings send from dpkg (lp: 68553)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Oct 2006 10:41:44 +0200
+
+python-apt (0.6.19ubuntu9) edgy; urgency=low
+
+  * Reupload to restore dependency on python-central.
+  * debian/rules: Remove dh_python call.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 12 Oct 2006 14:26:46 +0200
+
+python-apt (0.6.19ubuntu8) edgy; urgency=low
 
- -- Michael Vogt <mvo@debian.org>  Tue, 19 Dec 2006 13:32:11 +0100
+  * support pkgDepCache::ActionGroup()
 
-python-apt (0.6.19) unstable; urgency=low
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 Oct 2006 18:03:46 +0200
+
+python-apt (0.6.19ubuntu7) edgy; urgency=low
+
+  * python/generic.h:
+    - fix incorrect use of PyMem_DEL(), use PyObject_DEL()
+      instead. This fixes a nasty segfault with python2.5
+      (lp: 63226)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  4 Oct 2006 16:45:53 +0200
+
+python-apt (0.6.19ubuntu6) edgy; urgency=low
+
+  * python/progress.cc:
+    - fix memleak (lp: #43096)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 18:33:44 +0200
+
+python-apt (0.6.19ubuntu5) edgy; urgency=low
+
+  * python/pkgmanager.cc:
+    - fix typo (closes: #382853)
+  * debian/control:
+    - tightend dependency (closes: #383478)
+  * apt/progress.py:
+    - use os._exit() in the child (lp: #53298)
+    - use select() when checking for statusfd (lp: #53282)
+  * acknoledge NMU (closes: #378048, #373512)
+  * python/apt_pkgmodule.cc:
+    - fix missing docstring (closes: #368907), 
+      Thanks to Josh Triplett
+  * make it build against python2.5
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Sep 2006 18:28:19 +0200
+
+python-apt (0.6.19ubuntu4) edgy; urgency=low
+
+  * Rebuild to add support for python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  8 Sep 2006 13:32:47 +0000
+  
+python-apt (0.6.19ubuntu3) edgy; urgency=low
+
+  * merged ddtp support
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 16:25:51 +0200
+
+python-apt (0.6.19ubuntu2) edgy; urgency=low
+
+  * tightened build-deps on latest apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 Aug 2006 17:02:30 +0200
+
+python-apt (0.6.19ubuntu1) edgy; urgency=low
 
   [ Michael Vogt ]
   * doc/examples/print_uris.py:
@@ -50,6 +222,7 @@ python-apt (0.6.19) unstable; urgency=low
       with binary packages
   * python/apt_pkgmodule.cc:
     - export sha256 generation
+  * added support for the pkgDepCache.IsGarbage() flag
 
   [ Otavio Salvador ]
   * apt/cache.py:
@@ -57,7 +230,7 @@ python-apt (0.6.19) unstable; urgency=low
     - 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
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 27 Jul 2006 15:00:55 +0200
 
 python-apt (0.6.18-0.2) unstable; urgency=low
 
@@ -84,14 +257,7 @@ python-apt (0.6.18) unstable; urgency=low
 
 python-apt (0.6.17) unstable; urgency=low
 
-  * apt/progress.py: 
-    - initialize FetchProgress.eta with the correct type
-    - strip the staus str before passing it to InstallProgress.statusChanged()
-    - added InstallProgress.statusChange(pkg, percent, status) 
-    - make DumbInstallProgress a new-style class 
-      (thanks to kamion for the suggestions)
-    - fix various pychecker warnings
-  * apt/cache.py:
+    * apt/cache.py:
     - return useful values on Cache.update()
     - Release locks on failure (thanks to Colin Watson)
     - fix various pychecker warnings
@@ -109,6 +275,83 @@ python-apt (0.6.17) unstable; urgency=low
   
  -- 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)
+  * the full merge needs a newer python-support 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 21:33:40 +0200
+
+python-apt (0.6.16.2ubuntu8) dapper; urgency=low
+
+  * apt/package.py:
+    - fix return value in {candidate,installed}Downloadable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 May 2006 19:28:44 +0200
+
+python-apt (0.6.16.2ubuntu7) dapper; urgency=low
+
+  * apt/package.py:
+    - check if _lookupRecord() succeeded when checking
+      maintainer or description (fixes invalid descriptions under 
+      rare circumstances in gnome-app-install)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 May 2006 18:12:58 +0200
+
+python-apt (0.6.16.2ubuntu6) dapper; urgency=low
+
+  * debian/control:
+    - Replaces: python-apt (<< 0.6.11), instead of Conflicts which is not
+      correct here. (closes: #308586).
+  * python/srcrecords.cc:
+    - don't run auto "Restart" before performing a Lookup (but require
+      explicit "Restart", fixes the docs/examples/sources.py example)
+    - fix the initalization (no need to pass a PkgCacheType to the records)
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  8 May 2006 16:40:14 +0200
+
+python-apt (0.6.16.2ubuntu5) dapper; urgency=low
+
+  * apt/cache.py: Release locks on failure (thanks to Colin Watson)
+    (closes: #35867)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 21 Mar 2006 15:09:14 +0100
+
+python-apt (0.6.16.2ubuntu4) dapper; urgency=low
+
+  * apt/package.py: 
+     - added Package.setDelete(purge) option
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  6 Mar 2006 18:59:33 +0000
+
+python-apt (0.6.16.2ubuntu3) dapper; urgency=low
+
+  * apt/package.py: undo some damager from pychecker
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  1 Mar 2006 15:34:23 +0100
+
+python-apt (0.6.16.2ubuntu2) dapper; urgency=low
+
+  * apt/progress.py: 
+    - initialize FetchProgress.eta with the correct type
+    - strip the staus str before passing it to InstallProgress.statusChanged()
+  * apt/cache.py:
+    - return useful values on Cache.update()
+  * fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 14:07:06 +0100
+
+python-apt (0.6.16.2ubuntu1) dapper; urgency=low
+
+  * apt/progress.py: 
+    - added InstallProgress.statusChange(pkg, percent, status) 
+    - make DumbInstallProgress a new-style class 
+      (thanks to kamion for the suggestions)
+    - fix various pychecker warnings
+  * apt/cache.py, apt/package.py: fix various pychecker warnings
+
+ -- 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.
@@ -120,14 +363,25 @@ python-apt (0.6.16.2) unstable; urgency=low
   
 python-apt (0.6.16.1) unstable; urgency=low
 
-  * memleak fixed when pkgCache objects are deallocated
   * typos fixed (thanks to Gustavo Franco)
   * pkgRecords.Record added to get raw record data
   * python/cache.cc: "key" in pkgCache::VerIterator.DependsList[key] is
-                     no longer locale specific but always english
+                     no longer locale specific but always englis
 
  -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:41:13 +0100
 
+python-apt (0.6.16ubuntu2) dapper; urgency=low
+
+  * Drop python2.3 package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Feb 2006 15:27:26 +0000
+
+python-apt (0.6.16ubuntu1) dapper; urgency=low
+
+  * memleak fixed when pkgCache objects are deallocated
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 Jan 2006 00:08:05 +0100
+
 python-apt (0.6.16) unstable; urgency=low
 
   * added GetPkgAcqFile to queue individual file downloads with the 
diff --git a/debian/compat b/debian/compat
index 7813681f..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
\ No newline at end of file
+5
diff --git a/debian/control b/debian/control
index 78b9f2a1..2a344320 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,13 @@
 Source: python-apt
 Section: python
 Priority: optional
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Michael Vogt <mvo@ubuntu.com>
+XSBC-Original-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
+Standards-Version: 3.7.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.45), apt-utils, python-all-dev, python-central, python-distutils-extra, cdbs
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.46.4ubuntu8), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
+XS-Vcs-Bzr: http://launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
 
 Package: python-apt
 Architecture: any
@@ -14,9 +16,10 @@ 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}
+Suggests: python-apt-dbg
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
- The apt-pkg Python interface will provide full access to the internal 
+ 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:
  .
@@ -25,5 +28,16 @@ Description: Python interface to libapt-pkg
   - Parsing of Debian package control files, and other files with a
     similar structure
  .
- Furthermore it provides an abstraction of the sources.list configuration
- on the repository and the distro level.
+ The included 'aptsources' Python interface provides an abstraction of 
+ the sources.list configuration on the repository and the distro level.
+
+Package: python-apt-dbg
+Priority: extra
+Architecture: any
+Depends: python-dbg, python-apt (= ${Source-Version}), ${shlibs:Depends}
+Description: Python interface to libapt-pkg (debug extension)
+ 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.
+ .
+ This package contains the extension built for the python debug interpreter.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/python-apt.install b/debian/python-apt.install
new file mode 100644
index 00000000..3e08ba50
--- /dev/null
+++ b/debian/python-apt.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*
+debian/tmp/usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 016167d6..33d04a21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,44 @@
 #!/usr/bin/make -f
-  
-DEB_AUTO_CLEANUP_RCS            := yes
 
+DEB_AUTO_CLEANUP_RCS := yes
 DEB_PYTHON_SYSTEM=pycentral
 
-# Add here any variable or target overrides you need
+export DH_PYCENTRAL=nomove
+
+DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
 
+# Add here any variable or target overrides you need
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+
+PKG=python-apt
+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)
+
+arch-build::
+	rm -rf debian/arch-build
+	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` \
+	  | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
+	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
+
+build/python-apt-dbg::
+	set -e; \
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py build; \
+	done
+
+install/python-apt-dbg::
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \
+	done
+	find debian/python-apt-dbg \
+		! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python-apt-dbg -depth -empty -exec rmdir {} \;
+
+binary-predeb/python-apt-dbg::
+	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+
+clean::
+	rm -rf build/lib* build/temp*