merged from mvo

3 files changed, 91 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index da376bc1..d63f01a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,82 @@
-python-apt (0.7.10.4ubuntu2) UNRELEASED; urgency=low
+python-apt (0.7.11.2ubuntu1) UNRELEASED; urgency=low
 
+  [ Loïc Minier ]
   * Revert addition of gcc and gcc_s to python-apt libs as the toolchain has
     been fixed; LP: #375334.
+  
+  [ Michael Vogt ]
+  * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:51:27 +0200
+
+python-apt (0.7.11.2) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * python/cache.cc:
+    - Support Breaks, Enhances dependency types (Closes: #416247)
+  * debian/control:
+    - Only recommend libjs-jquery (Closes: #527543)
+    - Build-depend on libapt-pkg-dev (>= 0.7.22~)
+    - Update Standards-Version to 3.8.2
+  * apt/cache.py:
+    - Correctly handle rootdir on second and later invocations of
+      open(), by calling InitSystem again. (LP: #320665).
+    - Provide broken_count, delete_count, install_count, keep_count
+      properties (Closes: #532338)
+    - Only create Package objects when they are requested, do not keep them in
+      a dict. Saves 10MB for 25,000 packages on my machine.
+  * apt/package.py:
+    - Allow to set the candidate of a package (Closes: #523997)
+      + Support assignments to the 'candidate' property of Package objects.
+      + Initial patch by Sebastian Heinlein
+
+  [ Stefano Zacchiroli ]
+  * debian/python-apt.doc-base: register the documentation with the
+    doc-base system (Closes: #525134)
+
+  [ Sebastian Heinlein ]
+  * apt/progress.py: Extract the package name from the status message
+    (Closes: #532660) 
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 30 Jul 2009 14:08:30 +0200
+
+python-apt (0.7.11.1) unstable; urgency=low
 
- -- Loïc Minier <loic.minier@ubuntu.com>  Mon, 29 Jun 2009 10:30:58 +0200
+  [ Stephan Peijnik ]
+  * apt/progress/__init__.py:
+    - Exception handling fixes in InstallProgress class.
+  
+  [ Michael Vogt ]
+  * python/tag.cc:
+    - merge patch from John Wright that adds FindRaw method
+      (closes: #538723)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:15:56 +0200
+
+python-apt (0.7.11.0) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * data/templates/Debian.info.in: Squeeze will be 6.0, not 5.1
+
+  [ Stephan Peijnik ]
+  * apt/progress/__init__.py:
+    - add update_status_full() that takes file_size/partial_size as 
+      additional callback arguments
+    - add pulse_items() that takes a addtional "items" tuple that 
+      gives the user full access to the individual items that are
+      fetched
+  * python/progress.cc:
+    - low level code for update_status_full and pulse_items()
+    - better threading support
+  
+  [ Michael Vogt ]
+  * aptsources/distro.py:
+    - fix indent error that causes incorrect sources.list additons
+      (LP: #372224)
+  * python/progress.cc:
+    - fix crash in RunSimpleCallback()
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 20 Jul 2009 15:35:27 +0200
 
 python-apt (0.7.10.4ubuntu1) karmic; urgency=low
 
@@ -14,7 +87,7 @@ python-apt (0.7.10.4ubuntu1) karmic; urgency=low
       required dirs/files automatically
   * python/progress.cc:
     - fix crash in RunSimpleCallback()
-  
+
   [ Loic Minier ]
   * Merge changes below from Michael Casadevall; note that these changes were
     concurrently uploaded in a different form in 0.7.10.3ubuntu2 which wasn't
diff --git a/debian/control b/debian/control
index 57a95cd4..99f77927 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 XS-Python-Version: all
 Build-Depends: apt-utils,
                cdbs,
                debhelper (>= 5.0.37.1),
-               libapt-pkg-dev (>= 0.7.10),
+               libapt-pkg-dev (>= 0.7.22~),
                python-all-dbg,
                python-all-dev,
 	       python2.4-dev,
@@ -25,9 +25,8 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 
 Package: python-apt
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release,
-         libjs-jquery
-Recommends: iso-codes
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release
+Recommends: iso-codes, libjs-jquery
 Breaks: debdelta (<< 0.28~)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte
diff --git a/debian/python-apt.doc-base b/debian/python-apt.doc-base
new file mode 100644
index 00000000..d25926b7
--- /dev/null
+++ b/debian/python-apt.doc-base
@@ -0,0 +1,11 @@
+Document: python-apt-api-reference
+Title: Python APT: API reference manual
+Abstract: API reference manual for Python bindings to libapt-pkg
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-apt/html/index.html
+Files: /usr/share/doc/python-apt/html/*
+
+Format: Text
+Files: /usr/share/doc/python-apt/text/*