merged from debian-sid

diff --cc debian/changelog
index da079026e9d16b23e584accce63cfe9e8c807672,051bfc5da37eab9943512c9de85bc387ddc7356a..aa9a97eb2b66aeea2eac5d160f9908656cea8593
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -49,31 -49,8 +49,31 @@@ apt (0.8.12) unstable; urgency=lo
      the native arch, except where the Arch: all package is declared
      Multi-Arch: foreign.  (Closes: #613584)
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 08 Mar 2011 19:20:56 +0100
+  -- Michael Vogt <mvo@debian.org>  Thu, 10 Mar 2011 14:46:48 +0100
  
 +apt (0.8.11.5ubuntu3) UNRELEASED; urgency=low
 +
 +  * cherry pick cdrom mount fixes from lp:~mvo/apt/mvo
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 09 Mar 2011 12:16:32 +0100
 +
 +apt (0.8.11.5ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debindexfile.cc:
 +    - ignore missing deb-src files in /var/lib/apt/lists, thanks
 +      to Thorsten Spindler (LP: #85590)
 +  * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
 +    - honor Dpkg::Chroot-Directory in the RunScripts*() methods
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Mar 2011 17:39:30 +0100
 +
 +apt (0.8.11.5ubuntu1) natty; urgency=low
 +
 +  * Merged from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Feb 2011 12:01:19 +0100
 +
  apt (0.8.11.5) unstable; urgency=low
  
    [ Christian Perrier ]