merged from lp:~mvo/apt/mvo

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index db80c14ef9c36632ab8ea1c175438a28c45e0296..3c40d13c0e63a09d54fc9563e734088b580e8465 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-apt (0.8.16~exp5) experimental; urgency=low
+apt (0.8.16~exp5) UNRELEASEDexperimental; urgency=low
 
+  * merged the latest debian-sid fixes
   * apt-pkg/makefile:
     - install sha256.h compat header
   * apt-pkg/pkgcachegen.{cc,h}:
@@ -12,6 +13,9 @@ apt (0.8.16~exp5) experimental; urgency=low
       like the translations index
   * apt-pkg/acquire.cc:
     - fix potential divide-by-zero
+  * methods/mirror.cc:
+    - include the architecture(s) in the query string as well so 
+      that the server can make better decisions
 
  -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200
 
@@ -111,8 +115,9 @@ apt (0.8.16~exp1) experimental; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 
-apt (0.8.15.5.6) UNRELEASED; urgency=low
+apt (0.8.15.6) unstable; urgency=low
 
+  [ Michael Vogt ]
   * apt-pkg/contrib/fileutl.{cc,h}:
     - add GetModificationTime() helper
   * apt-pkg/pkgcachegen.cc:
@@ -130,8 +135,11 @@ apt (0.8.15.5.6) UNRELEASED; urgency=low
   * apt-pkg/acquire-item.cc:
     - if no Release.gpg file is found, still load the hashes for
       verification (closes: #636314) and add test
+  
+  [ David Kalnischkies ]
+  * lots of cppcheck fixes
 
- -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
 
 apt (0.8.15.5) unstable; urgency=low