merged from lp:~mvo/apt/mvo

diff --cc apt-pkg/contrib/fileutl.cc
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc debian/changelog
index 34a544b4420ed6f9440b45c7b3ea1f4d39955fa6,ff5675a0c42cf7bcf4daffecaf35bcb265fb596a..6b88f84bf065e4541d974eca7f3c28315f6608e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,95 -1,20 +1,106 @@@
 -apt (0.8.12) UNRELEASED; urgency=low
++apt (0.8.11.5ubuntu2) natty; urgency=low
+ 
+   [ Michael Vogt ]
 -  * merged lp:~evfool/apt/fix641673:
 -    - String-fix in the source and the translations for the grammatical 
 -      mistake reported in bug LP: #641673, thanks to Robert Roth
 -  * merged lp:~evfool/apt/fix418552:
 -    - Grammar fix for bug LP: #418552, thanks to Robert Roth
+   * 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, 10 Feb 2011 17:37:56 +0100
++ -- 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 ]
 +  * Add missing dot in French translation of manpages. Merci, Olivier
 +    Humbert.
 +  * French translation update
 +  * French manpages translation update
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - party revert fix in 0.8.11.2 which marked all packages as manual
 +      installed if the FromUser bit is set in the MarkInstall call.
 +      The default for this bit is true and aptitude depends on the old
 +      behavior so the package is only marked as manual if its not marked
 +      ("old" behavior) or if automatic installation is enabled - which
 +      aptitude disables always (see also #613775)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 17 Feb 2011 15:16:31 +0100
 +
 +apt (0.8.11.4) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/error.cc:
 +    - ensure that va_list is not invalid in second try
 +  * cmdline/apt-get.cc:
 +    - don't remove new dependencies of garbage packages (Closes: #613420)
 +  
 +  [ Michael Vogt ]
 +  * test/integration/*
 +    - fix dashish in the integration tests
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 16 Feb 2011 14:36:03 +0100
 +
 +apt (0.8.11.3) unstable; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.cc:
 +    - really detect bigendian machines by including config.h,
 +      so we can really (Closes: #612986)
 +  * apt-pkg/contrib/mmap.cc:
 +    - Base has as 'valid' failure states 0 and -1 so add a simple
 +      validData method to check for failure states
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 14 Feb 2011 16:58:03 +0100
 +
 +apt (0.8.11.2) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged lp:~evfool/apt/fix641673:
 +    - String-fix in the source and the translations for the grammatical 
 +      mistake reported in bug LP: #641673, thanks to Robert Roth
 +  * merged lp:~evfool/apt/fix418552:
 +    - Grammar fix for bug LP: #418552, thanks to Robert Roth
 +  
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - add --install-suggests option (Closes: #473089)
 +  * apt-pkg/depcache.cc:
 +    - mark a package which was requested to be installed on commandline
 +      always as manual regardless if it is already marked or not as the
 +      marker could be lost later by the removal of rdepends (Closes: #612557)
 +  * methods/rred.cc:
 +    - read patch into MMap only if we work on uncompressed patches
 +    - update size of dynamic MMap as we write in from the outside
 +  * apt-pkg/contrib/mmap.cc:
 +    - do not try to free the mapping if its is unset
 +  * apt-pkg/contrib/fileutl.cc:
 +    - reorder the loaded filesize bytes for big endian (Closes: #612986)
 +      Thanks to Jörg Sommer for the detailed analyse!
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 14 Feb 2011 12:07:18 +0100
 +
 +apt (0.8.11.1) unstable; urgency=low
 +
 +  [ Stefan Lippers-Hollmann ]
 +  * cmdline/apt-key:
 +    - fix root test which prevented setting of trustdb-name
 +      which lets gpg fail if it adds/remove keys from trusted.gpg
 +      as it tries to open the (maybe) not existent /root/.gnupg
 +
 +  [ David Kalnischkies ]
 +  * debian/apt.symbols:
 +    - add more arch dependent symbols
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 09 Feb 2011 17:49:59 +0100
  
 -apt (0.8.11) UNRELEASED; urgency=low
 +apt (0.8.11) unstable; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/depcache.cc: