From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 1 Aug 2011 13:30:50 +0000 (+0200)
Subject: merged from the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~155
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f96bcef72c47ab32f4742da2673a12b3a47d8367?hp=--cc

merged from the debian-sid branch
---

f96bcef72c47ab32f4742da2673a12b3a47d8367
diff --cc debian/changelog
index 9fd44439c,75ac08328..a37ffe4d6
--- a/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