Merge from debian-sid

1 files changed, 29 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index b2936ba1..e67408ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ python-apt (0.7.92) UNRELEASED; urgency=low
     mark a package as automatically installed.
   * Drop apt_pkg.Cache.open() and apt_pkg.Cache.close(), they cause segfaults
     and memory leaks. Simply create a new cache instead.
-  * Merge 0.7.10.4 from unstable
+  * Merge 0.7.10.4, 0.7.11.0 from unstable
   * debian/control: Update Standards-Version to 3.8.2
   * Make AcquireFile a subclass of AcquireItem
   * Make ConfigurationPtr,ConfigurationSub subclasses of Configuration.
@@ -47,16 +47,6 @@ python-apt (0.7.92) UNRELEASED; urgency=low
   * apt/progress.py: Extract the package name from the status message
     (Closes: #532660)
 
-  [ 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()
-
  -- Julian Andres Klode <jak@debian.org>  Wed, 15 Jul 2009 14:56:24 +0200
 
 python-apt (0.7.91) experimental; urgency=low
@@ -97,6 +87,34 @@ 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.11.0) UNRELEASED; 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()
+  * apt/cache.py:
+    - when the cache is run with a alternative rootdir, create
+      required dirs/files automatically
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 20 Jul 2009 15:35:27 +0200
+
 python-apt (0.7.10.4) unstable; urgency=low
 
   [ Michael Vogt ]