merged from the debian-sid branch

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

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

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

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

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

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

diff --cc apt-pkg/deb/debmetaindex.cc
index 81afb22b69a28fcbc0dffa06a43ba9aae5987fc5,f6c50742e0f6725b152a36c3007a3f34cb41de40..e1f8219e361b314c066084d18e80ec87558cfa8f
--- 1/apt-pkg/deb/debmetaindex.cc
--- 2/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@@ -365,10 -349,9 +365,10 @@@ class debSLTypeDebian : public pkgSourc
        vector<string> const Archs =
                (arch != Options.end()) ? VectorizeString(arch->second, ',') :
                                APT::Configuration::getArchitectures();
 +      map<string, string>::const_iterator const trusted = Options.find("trusted");
  
        for (vector<metaIndex *>::const_iterator I = List.begin();
-          I != List.end(); I++)
+          I != List.end(); ++I)
        {
         // We only worry about debian entries here
         if (strcmp((*I)->GetType(), "deb") != 0)

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

diff --cc apt-pkg/deb/dpkgpm.cc
index 019b72bb83e01d7af5066599cae5122518923af5,46f48777ce7960665afee01e5b42659ae06ac3f6..3c4c244ccff39ce62374f32efa69cb10eb4d8a8b
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -700,13 -684,13 +700,13 @@@ bool pkgDPkgPM::OpenLog(
                                   _config->Find("Dir::Log::History"));
     if (!history_name.empty())
     {
 -      history_out = fopen(history_name.c_str(),"a");
 -      if (history_out == NULL)
 +      d->history_out = fopen(history_name.c_str(),"a");
 +      if (d->history_out == NULL)
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
        chmod(history_name.c_str(), 0644);
 -      fprintf(history_out, "\nStart-Date: %s\n", timestr);
 +      fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
        string remove, purge, install, reinstall, upgrade, downgrade;
-       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
        {
         enum { CANDIDATE, CANDIDATE_AUTO, CURRENT_CANDIDATE, CURRENT } infostring;
         string *line = NULL;

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

diff --cc apt-pkg/depcache.h
index d935c18872c1cb21bf05caa256998615433d0e9f,760f0b5895ac33068fc7bace85159f2684148452..66cb7dbababebcf43bfe678adb5d3ec79557a1a5
--- 1/apt-pkg/depcache.h
--- 2/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@@ -398,11 -388,11 +398,11 @@@ class pkgDepCache : protected pkgCache:
     /** \name State Manipulators
      */
     // @{
 -   void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
 +   bool MarkKeep(PkgIterator const &Pkg, bool Soft = false,
                 bool FromUser = true, unsigned long Depth = 0);
-    bool MarkDelete(PkgIterator const &Pkg, bool Purge = false,
 -   void MarkDelete(PkgIterator const &Pkg, bool MarkPurge = false,
++   bool MarkDelete(PkgIterator const &Pkg, bool MarkPurge = false,
                     unsigned long Depth = 0, bool FromUser = true);
 -   void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
 +   bool MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
                    unsigned long Depth = 0, bool FromUser = true,
                    bool ForceImportantDeps = false);
     void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };

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

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

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

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

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

diff --cc apt-pkg/tagfile.h
index 23f5c57e6df33361df220bea05dd40610a98b483,a101d7b1ebbf14b820f5f2cd0ff390cf528891ed..3a2dee7c7462b1dc3c09e8a8114e6da5a79fdc37
--- 1/apt-pkg/tagfile.h
--- 2/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@@ -78,14 -79,18 +78,14 @@@ class pkgTagSectio
        Stop = this->Stop;
     };
     
-    pkgTagSection() : Section(0), Stop(0) {};
+    pkgTagSection() : Section(0), TagCount(0), Stop(0) {};
 +   virtual ~pkgTagSection() {};
  };
  
 +class pkgTagFilePrivate;
  class pkgTagFile
  {
 -   FileFd &Fd;
 -   char *Buffer;
 -   char *Start;
 -   char *End;
 -   bool Done;
 -   unsigned long iOffset;
 -   unsigned long Size;
 +   pkgTagFilePrivate *d;
  
     bool Fill();
     bool Resize();

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

diff --cc debian/changelog
index c4197721f594ebcafad562a84fed793d007768da,67e60dc3480bb36b73b018c32398710495236470..000459c5cf7e525e98609b6c1341f69cf6501765
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,114 -1,29 +1,141 @@@
 +apt (0.8.16~exp5) experimental; urgency=low
 +
++  * merged the latest debian-sid fixes
 +  * 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)
 +    - fix crash when P.Arch() was used but the cache got remapped
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - do not check for a "Package" tag in optional index targets
 +      like the translations index
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +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:
 +    - regenerate the cache if the sources.list changes to ensure
 +      that changes in the ordering there will be honored by apt
 +  * apt-pkg/sourcelist.{cc,h}:
 +    - add pkgSourceList::GetLastModifiedTime() helper
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:57:08 +0200
 +
 +apt (0.8.16~exp3) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcache.h:
 +    - readd All{Foreign,Allowed} as suggested by Julian to
 +      remain strictly API compatible
 +  * apt-pkg/acquire*.{cc,h}:
 +    - try even harder to support really big files in the fetcher by
 +      converting (hopefully) everything to 'long long' (Closes: #632271)
 +  * ftparchive/writer.cc:
 +    - generate all checksums in one run over the file for Release
 +  * cmdline/apt-get.cc:
 +    - add an --assume-no option for testing to say 'no' to everything
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add trusted=yes option to mark unsigned (local) repository as trusted
 +      based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
 +
 +  [ Michael Vogt ]
 +  * merge fixes from the debian/unstable upload
 +  * merge lp:~mvo/apt/sha512-template to get fixes for the 
 +    sha1/md5 verifiation (closes: #632520)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 15 Jul 2011 09:56:17 +0200
 +
 +apt (0.8.16~exp2) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
 +    use the internal resolver can now be used also with external
 +    ones as the usage is hidden in between the old API
 +  * provide two edsp solvers in apt-utils:
 +    - 'dump' to quickly output a complete scenario and
 +    - 'apt' to use the internal as an external resolver
 +  * apt-pkg/pkgcache.h:
 +    - clean up mess with the "all" handling in MultiArch to
 +      fix LP: #733741 cleanly for everyone now
 +  * apt-pkg/depcache.cc:
 +    - use a boolean instead of an int for Add/Remove in AddStates
 +      similar to how it works with AddSizes
 +    - let the Mark methods return if their marking was successful
 +    - if a Breaks can't be upgraded, remove it. If it or a Conflict
 +      can't be removed the installation of the breaker fails.
 +  * cmdline/apt-get.cc:
 +    - do not discard the error messages from the resolver and instead
 +      only show the general 'Broken packages' message if nothing else
 +
 +  [ Stefano Zacchiroli ]
 +  * doc/external-dependency-solver-protocol.txt:
 +    - describe EDSP and the configuration interface around it
 +  
 +  [ Michael Vogt ]
 +  * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
 +  * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
 +    without breaking the ABI
 +  * increase ABI version and update package names
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
 +
 +apt (0.8.16~exp1) experimental; urgency=low
 +
 +  * merged with the debian/unstable upload
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 +
+ apt (0.8.15.6) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/contrib/fileutl.{cc,h}:
+     - add GetModificationTime() helper
+   * apt-pkg/pkgcachegen.cc:
+     - regenerate the cache if the sources.list changes to ensure
+       that changes in the ordering there will be honored by apt
+   * apt-pkg/sourcelist.{cc,h}:
+     - add pkgSourceList::GetLastModifiedTime() helper
+   * 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)
+     - fix crash when P.Arch() was used but the cache got remapped
+   * 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
+   
+   [ David Kalnischkies ]
+   * lots of cppcheck fixes
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
+ 
  apt (0.8.15.5) unstable; urgency=low
  
    [ David Kalnischkies ]

diff --cc ftparchive/writer.cc
Simple merge