Merge remote-tracking branch 'mvo/feature/hash-stats' into debian/experimental

Conflicts:
	apt-pkg/acquire-item.cc
	apt-pkg/acquire-item.h
	apt-pkg/deb/debmetaindex.h
	apt-pkg/pkgcache.cc
	test/integration/test-apt-ftparchive-src-cachedb

diff --cc apt-pkg/pkgcache.cc
index 2b615363487ef34d6ebca301d9c75283f31769f1,c1a3c0c55d37e0efd0a7378b9bc2c96ee3d81f47..4fbdc93d519a56085b5befa38aa14abd618f2833
--- 1/apt-pkg/pkgcache.cc
--- 2/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -55,11 -55,7 +55,7 @@@ pkgCache::Header::Header(
     /* Whenever the structures change the major version should be bumped,
        whenever the generator changes the minor version should be bumped. */
     MajorVersion = 9;
- #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
 -   MinorVersion = 1;
 +   MinorVersion = 2;
- #else
-    MinorVersion = 1;
- #endif
     Dirty = false;
     
     HeaderSz = sizeof(pkgCache::Header);

diff --cc apt-pkg/pkgcache.h
Simple merge

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

diff --cc cmdline/apt-cache.cc
Simple merge