merged from lp:~mvo/apt/mvo

diff --cc apt-pkg/pkgcachegen.cc
Simple merge

diff --cc debian/changelog
index f648ac958d67f4c37a25dead15f773ae2b55f0aa,e17b1abd01b37e6c770c52b3083b2f39b054c06a..c36d823243b407d38830460982be504c08525f9b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,5 +1,42 @@@
- apt (0.8.16~exp5ubuntu1) UNRELEASEDoneiric; urgency=low
 -apt (0.8.15.6) unstable; urgency=low
++apt (0.8.16~exp5ubuntu1~ppa1) oneiric; urgency=low
  
 +  * merged from debian/experimental
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Aug 2011 11:20:52 +0200
 +
 +apt (0.8.16~exp5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/makefile:
 +    - install sha256.h compat header
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Jul 2011 13:44:01 +0200
 +
 +apt (0.8.16~exp4) experimental; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/pkgcache.h:
 +    - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
 +  * apt-pkg/pkgcachegen.cc:
 +    - Write the file size to the cache
 +  * apt-pkg/pkgcache.cc:
 +    - Check that cache is at least CacheFileSize bytes large (LP: #16467)
 +  
 +  [ Michael Vogt ]
 +  * merged latest fixes from debian-sid
 +  * apt-pkg/cdrom.{cc,h}:
 +    - cleanup old ABI break avoidance hacks
 +  * [ABI break] apt-pkg/acquire-item.{cc,h}:
 +    - cleanup around OptionalIndexTarget and SubIndexTarget
 +  * [ABI break] merged patch from Jonathan Thomas to have a new
 +    RecordField() function in the pkgRecorder parser. Many thanks
 +    Thomas
 +  * [ABI break] merge patch from Jonathan Thomas to speed up the
 +    depcache by caching the install-recommends and install-suggests
 +    values
    * apt-pkg/contrib/fileutl.{cc,h}:
      - add GetModificationTime() helper
    * apt-pkg/pkgcachegen.cc: