merge with debian-experimental

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 73881ac54061859b74051a344251a53700ad95a0..9aeb2f8099a3235822ce5e72149b24f797531ea9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.16~exp3) experimental; urgency=low
+apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
 
   [ David Kalnischkies ]
   * apt-pkg/pkgcache.h:
@@ -8,6 +8,11 @@ apt (0.8.16~exp3) experimental; urgency=low
     - try even harder to support really big files in the fetcher by
       converting (hopefully) everything to 'long long' (Closes: #632271)
 
+  [ Michael Vogt ]
+  * merge fixes from the debian/unstable upload
+  * merge lp:~mvo/apt/sha512-template to get fixes for the 
+    sha1/md5 verifiation (closes: #632520)
+
  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 05 Jul 2011 15:56:42 +0200
 
 apt (0.8.16~exp2) experimental; urgency=low