merge with debian/experimental

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/aptconfiguration.cc
Simple merge

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

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

diff --cc apt-pkg/contrib/cdromutl.cc
Simple merge

diff --cc apt-pkg/contrib/configuration.cc
Simple merge

diff --cc apt-pkg/contrib/error.cc
Simple merge

diff --cc apt-pkg/contrib/fileutl.cc
Simple merge

diff --cc apt-pkg/contrib/fileutl.h
Simple merge

diff --cc apt-pkg/contrib/netrc.cc
Simple merge

diff --cc apt-pkg/contrib/sha1.cc
Simple merge

diff --cc apt-pkg/contrib/strutl.cc
Simple merge

diff --cc apt-pkg/contrib/strutl.h
Simple merge

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

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

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

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

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

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

diff --cc apt-pkg/indexcopy.cc
index f52ecbbcb606a336142ac0cb25df187fe68ad2b7,747e464bee445dc262e3e57eabdf358155c88a65..4df018ef45512c26244a16bbf175db24be81ffa6
--- 1/apt-pkg/indexcopy.cc
--- 2/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@@ -56,8 -53,8 +56,8 @@@ bool IndexCopy::CopyPackages(string CDR
     bool Debug = _config->FindB("Debug::aptcdrom",false);
     
     // Prepare the progress indicator
 -   unsigned long TotalSize = 0;
 +   off_t TotalSize = 0;
-    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
     {
        struct stat Buf;
        if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 &&
@@@ -71,10 -68,10 +71,10 @@@
     unsigned int NotFound = 0;
     unsigned int WrongSize = 0;
     unsigned int Packages = 0;
-    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
     {      
        string OrigPath = string(*I,CDROM.length());
 -      unsigned long FileSize = 0;
 +      off_t FileSize = 0;
        
        // Open the package file
        FileFd Pkg;
@@@ -788,8 -785,8 +788,8 @@@ bool TranslationsCopy::CopyTranslations
     bool Debug = _config->FindB("Debug::aptcdrom",false);
     
     // Prepare the progress indicator
 -   unsigned long TotalSize = 0;
 +   off_t TotalSize = 0;
-    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
     {
        struct stat Buf;
        if (stat(string(*I).c_str(),&Buf) != 0 &&
@@@ -803,10 -800,10 +803,10 @@@
     unsigned int NotFound = 0;
     unsigned int WrongSize = 0;
     unsigned int Packages = 0;
-    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
     {      
        string OrigPath = string(*I,CDROM.length());
 -      unsigned long FileSize = 0;
 +      off_t FileSize = 0;
        
        // Open the package file
        FileFd Pkg;

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

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

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/pkgrecords.cc
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc configure.in
Simple merge

diff --cc debian/changelog
index dd91d3aa82c2c7bff37b365c89886de920a78b9a,c9439b0d47e41820c80df092e1fb79d21c59512c..f14930aa41ffe779f2b7fdbb6070b9231dec0c50
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,55 +1,64 @@@
- apt (0.8.16~exp3+nmu1) experimental; urgency=low
++apt (0.8.16~exp6) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * Support large files in the complete toolset. Indexes of this
 +    size are pretty unlikely for now, but we need it for deb
 +    packages which could become bigger than 4GB now (LP: #815895)
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 13 Sep 2011 17:44:00 +0200
++ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 13 Sep 2011 17:51:49 +0200
++
+ 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
+   * apt-pkg/acquire.cc:
+     - fix potential divide-by-zero
+   * methods/mirror.cc:
+     - include the architecture(s) in the query string as well so 
+       that the server can make better decisions
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 14:52:54 +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
  

diff --cc ftparchive/apt-ftparchive.cc
Simple merge

diff --cc ftparchive/multicompress.cc
Simple merge

diff --cc ftparchive/override.cc
Simple merge

diff --cc ftparchive/writer.cc
Simple merge

diff --cc methods/cdrom.cc
Simple merge

diff --cc methods/ftp.cc
Simple merge

diff --cc methods/gpgv.cc
Simple merge

diff --cc methods/http.cc
Simple merge

diff --cc methods/http.h
index b74740ab3b8be01624a2f3af28a8ff0f4f5f883a,6302807c5e743fcfa2a764eaf462906596ec1f0d..c47d7184aab68fc5b50cab41594c952de1b00c30
--- 1/methods/http.h
--- 2/methods/http.h
+++ b/methods/http.h
@@@ -36,16 -36,16 +36,16 @@@ class CircleBu
     static struct timeval BwReadTick;
     static const unsigned int BW_HZ;
  
-    unsigned long long LeftRead()
 -   unsigned long LeftRead() const
++   unsigned long long LeftRead() const
     {
 -      unsigned long Sz = Size - (InP - OutP);
 +      unsigned long long Sz = Size - (InP - OutP);
        if (Sz > Size - (InP%Size))
         Sz = Size - (InP%Size);
        return Sz;
     }
-    unsigned long long LeftWrite()
 -   unsigned long LeftWrite() const
++   unsigned long long LeftWrite() const
     {
 -      unsigned long Sz = InP - OutP;
 +      unsigned long long Sz = InP - OutP;
        if (InP > MaxGet)
         Sz = MaxGet - OutP;
        if (Sz > Size - (OutP%Size))
@@@ -67,13 -67,13 +67,13 @@@
     bool WriteTillEl(string &Data,bool Single = false);
     
     // Control the write limit
 -   void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
 +   void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
-    bool IsLimit() {return MaxGet == OutP;};
-    void Print() {cout << MaxGet << ',' << OutP << endl;};
+    bool IsLimit() const {return MaxGet == OutP;};
+    void Print() const {cout << MaxGet << ',' << OutP << endl;};
  
     // Test for free space in the buffer
-    bool ReadSpace() {return Size - (InP - OutP) > 0;};
-    bool WriteSpace() {return InP - OutP > 0;};
+    bool ReadSpace() const {return Size - (InP - OutP) > 0;};
+    bool WriteSpace() const {return InP - OutP > 0;};
  
     // Dump everything
     void Reset();

diff --cc methods/mirror.cc
index 768e6b3a3fe33714844f263738fc442a6e51df00,a3e60ab150ddcffaf9a86a490d9857f8ac8437a1..61a7f12fd0aef68bbf424f42d28253e9e5de20b2
--- 1/methods/mirror.cc
--- 2/methods/mirror.cc
+++ b/methods/mirror.cc
@@@ -8,8 -8,7 +8,9 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
 +#include <config.h>
 +
+ #include <apt-pkg/aptconfiguration.h>
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/acquire-method.h>
  #include <apt-pkg/acquire-item.h>

diff --cc methods/rred.cc
Simple merge

diff --cc methods/rsh.h
Simple merge