merged from debian-sid

3 files changed, 59 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index c7016fc5..298c0ac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+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
+
+  [ 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 ]
diff --git a/debian/control b/debian/control
index 4c7b542f..83b2e421 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: python
 Priority: optional
 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,
                python-central (>= 0.5),
@@ -22,9 +22,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/*