From: Michael Vogt <mvo@debian.org>
Date: Wed, 18 Jun 2014 08:13:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/hash-stats' into debian/experimental
X-Git-Tag: 1.1.exp1~14
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/da029b0aaebdc64a3a9f6b7012213539421c934b

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
---

da029b0aaebdc64a3a9f6b7012213539421c934b
diff --cc apt-pkg/pkgcache.cc
index 2b6153634,c1a3c0c55..4fbdc93d5
--- a/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);