merged from the debian-sid branch

1 files changed, 38 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index 203c968d..15b445d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,47 @@
-python-apt (0.8.7ubuntu5) UNRELEASED; urgency=low
+python-apt (0.8.8ubuntu1) UNRELEASED; urgency=low
 
+  * merged from the debian-sid branch:
+    - do not build-depend on python-unittest2, only needed for python2.6
   * add dep8 style autopkgtest support
   * add "codename" to the PackageFile object
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Oct 2012 11:02:03 +0200
 
+  
+python-apt (0.8.8) unstable; urgency=low
+
+  [ Program translation updates ]
+  * po/pl.po: Polish (Michał Kułach) (closes: #684308)
+  * po/da.po: Danish (Joe Hansen) (closes: #689827)
+  
+  [ Michael Vogt ]
+  * merged lp:~sampo555/python-apt/fix_1042916 reuse existing but
+    disabled sources.list entries instead of duplicating them.
+    Thanks to "sampo555", LP: #1042916
+  * consolidate tests/test_lp1030278.py into the new 
+    tests/test_size_to_str.py
+  * apt/auth.py:
+    - support importing long keyids with leading 0x and mixed case
+  * debian/control:
+    - build-depend on python-unittest2 to get "with TestCase.assertRaises"
+      support in python2.6
+
+  [ Barry Warsaw ]
+  * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that
+    1) it first checks for PyLong-ness so that in Python 3 on i386, it
+    will be able to convert larger numbers (via doubles rather than ints);
+    2) before doing the conversions through the apt API, check to see if a
+    Python exception occurred, e.g. OverflowError, and return an error
+    condition in that case instead of masking it.  (LP: #1030278)
+
+  [ James Hunt ]
+  * python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated
+    value rather than a random one.
+  * lp:~jamesodhunt/python-apt/test-for-size_to_str:
+    - add test for size_to_str() to help with finding LP: #1030278
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 12 Oct 2012 10:47:11 +0200
+
 python-apt (0.8.7ubuntu4) quantal; urgency=low
 
   * apt/auth.py:
@@ -45,30 +82,6 @@ python-apt (0.8.7ubuntu1) quantal; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Oct 2012 13:47:43 +0200
 
-python-apt (0.8.8) UNRELEASED; urgency=low
-
-  [ Program translation updates ]
-  * po/pl.po: Polish (Michał Kułach) (closes: #684308)
-  
-  [ Michael Vogt ]
-  * merged lp:~sampo555/python-apt/fix_1042916 reuse existing but
-    disabled sources.list entries instead of duplicating them.
-    Thanks to "sampo555", LP: #1042916
-
-  [ Barry Warsaw ]
-  * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that
-    1) it first checks for PyLong-ness so that in Python 3 on i386, it
-    will be able to convert larger numbers (via doubles rather than ints);
-    2) before doing the conversions through the apt API, check to see if a
-    Python exception occurred, e.g. OverflowError, and return an error
-    condition in that case instead of masking it.  (LP: #1030278)
-
-  [ James Hunt ]
-  * python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated
-    value rather than a random one.
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Oct 2012 13:30:53 +0200
-
 python-apt (0.8.7) unstable; urgency=low
 
   [ Translation updates ]