* test/integration/test-hashsum-verification:

  - add regression test for hashsum verification
* apt-pkg/acquire-item.cc:
  - if no Release.gpg file is found, still load the hashes for
    verification (closes: #636314) and add test
* apt-pkg/pkgcachegen.cc:
  - fix incorrect comparision when checking sources.list freshness

diff --cc apt-pkg/acquire-item.cc
Simple merge

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

diff --cc debian/changelog
index 8311f641fa6abd9f0594fec295b87175b320844a,489960912fc3e04416ed6dcb8e0f0e776783009c..b00f829f49cea0b783e08cd5aa15d3f4d86964ec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,5 +1,55 @@@
 -apt (0.8.15.5.6) UNRELEASED; urgency=low
++apt (0.8.16~exp5ubuntu2) UNRELEASED; urgency=low
+ 
++  * test/integration/test-hashsum-verification:
++    - add regression test for hashsum verification
++  * apt-pkg/acquire-item.cc:
++    - if no Release.gpg file is found, still load the hashes for
++      verification (closes: #636314) and add test
++  * apt-pkg/pkgcachegen.cc:
++    - fix incorrect comparision when checking sources.list freshness
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 08 Aug 2011 16:59:55 +0200
++
 +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low
 +
 +  * merged new version from debian/experimental, this includes
 +    a ABI break and two new library packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 08 Aug 2011 14:30:07 +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: