merge with debian-sid 0.8.15.2

diff --cc debian/changelog
index 8bf5af2d1bebca71480239b3d151efb6b0d00aea,9a069215c04e109d48bd3267ad3e70d4ceb05312..52972e43b352a2e3319cb3d07497f3b4fa63f576
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,19 +1,33 @@@
- apt (0.8.15.2) unstable; urgency=low
+ apt (0.8.15.3) UNRELEASED; urgency=low
+ 
++  [ Michael Vogt ]
+   * apt-pkg/acquire-item.cc:
+     - improve error message for a expired Release file
+   * apt-pkg/algorithms.cc:
+     - Hold back packages that would enter "policy-broken" state on upgrade
+       when doing a "apt-get upgrade"
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jul 2011 11:22:54 +0200
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 06 Jul 2011 13:29:52 +0200
++ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 14 Jul 2011 21:26:09 +0200
+ 
+ apt (0.8.15.2) unstable; urgency=high
+ 
+   * fix from David Kalnischkies for the InRelease gpg verification 
+     code (LP: #784473)
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
  
  apt (0.8.15.1) unstable; urgency=low