Merge 0.7.13.5 pre.

1 files changed, 40 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index fb3b72f9..5f716c04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 python-apt (0.7.93) UNRELEASED; urgency=low
 
-  * Merge 0.7.13.0 - 0.7.13.3 from unstable.
+  * Merge 0.7.13.0 - 0.7.13.5 (UNRELEASED) from unstable.
   * Add a tutorial on how to do things which are possible with apt-get,
     like apt-get --print-uris update (cf. #551164).
 
@@ -86,6 +86,45 @@ python-apt (0.7.90) experimental; urgency=low
 
  -- Julian Andres Klode <jak@debian.org>  Wed, 15 Apr 2009 13:47:42 +0200
 
+python-apt (0.7.13.5) UNRELEASED; urgency=low
+
+  [ Colin Watson ]
+  * apt/progress/__init__.py:
+    - Fix InstallProgress.updateInterface() to cope with read() returning 0
+      on non-blocking file descriptors (LP: #491027).
+  
+  [ Michael Vogt ]
+  * apt/cache.py: 
+    - improved docstring for the cache
+    - add "enhances" property
+  * data/templates/Ubuntu.info.in:
+    - add lucid
+  * python/cache.cc:
+    - add UntranslatedDepType attribute to DependencyType
+    - add DepTypeEnum that returns a value from 
+      {DepDepends, DepPreDepends, ...}
+  * python/apt_pkgmodule.cc:
+    - add DepDpkgBreaks, DepEnhances constants
+  * doc/source/apt_pkg/{cache.rst, index.rst}:
+    - update documentation as well
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 02 Dec 2009 16:50:55 +0100
+
+python-apt (0.7.13.4) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * po/zh_CN.po:
+    - updated, thanks to Feng Chao
+  * python/progress.cc:
+    - if the mediaChange() does not return anything or is not implemented
+      send "false" to libapt
+
+  [ Julian Andres Klode ]
+  * apt/package.py: Fix dictionary access of VersionList, patch
+    by Sebastian Heinlein (Closes: #554895).
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 29 Nov 2009 20:26:31 +0100
+
 python-apt (0.7.13.3) unstable; urgency=low
 
   [ Michael Vogt ]