merged from the debian-sid branch

diff --cc debian/changelog
index 9fd44439c1085cd8822f0da858b800127e950cde,75ac0832821f6b91474bf9a58d90ee28c86943c7..a37ffe4d60d3ccbc01c04f3494066d87fe5163be
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,20 @@@
 -apt (0.8.15.5.6) UNRELEASED; urgency=low
++apt (0.8.15.5ubuntu1) oneiric; urgency=low
++
++  * apt-pkg/pkgcachegen.{cc,h}:
++    - fix crash when P.Arch() was used but the cache got remapped
++      (LP: #812862)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Aug 2011 15:18:50 +0200
++
++apt (0.8.15.5) unstable; urgency=low
++
++  [ David Kalnischkies ]
++  * apt-pkg/deb/deblistparser.cc:
++    - do not assume that the last char on a line is a \n (Closes: #633350)
++
++ -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:49:15 +0200
++
 +apt (0.8.15.4ubuntu2) oneiric; urgency=low
  
    * apt-pkg/contrib/fileutl.{cc,h}:
      - add GetModificationTime() helper