merge with debian-sid

diff --cc debian/changelog
index 5da8edb3bb1b2a097c32546a5abbaf1938e0268c,f14e3fe525bbb26acebac854f5743a04a58b47e6..df16a69dd0c949caa86d8d897a355d3d26ea1520
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,19 +1,38 @@@
 -apt (0.7.25.4) UNRELEASED; urgency=low
 +apt (0.7.26) UNRELEASED; urgency=low
 +
++  [ David Kalnischkies ]
 +  * [BREAK] add possibility to download and use multiply
 +    Translation files, configurable with Acquire::Translation
 +    (Closes: #444222, #448216, #550564)
 +  * Ignore :qualifiers after package name in build dependencies
 +    for now as long we don't understand them (Closes: #558103)
 +  * apt-pkg/contrib/mmap.{cc,h}:
 +    - extend it to have a growable flag - unused now but maybe...
 +  * apt-pkg/pkgcache.h:
 +    - use long instead of short for {Ver,Desc}File size,
 +      patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
 +  * apt-pkg/acquire-item.cc:
 +    - allow also to skip the last patch if target is reached,
 +      thanks Bernhard R. Link! (Closes: #545699)
 +  * ftparchive/writer.{cc,h}:
 +    - add APT::FTPArchive::AlwaysStat to disable the too aggressive
 +      caching if versions are build multiply times (not recommend)
 +      Patch by Christoph Goehre, thanks! (Closes: #463260)
  
-  -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
+   [ Ivan Masár ]
+   * Slovak translation update. Closes: #568294
+ 
 - -- Christian Perrier <bubulle@debian.org>  Wed, 03 Feb 2010 20:08:19 +0100
++ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 13 Feb 2010 01:42:50 +0100
  
- apt (0.7.25.3) UNRELEASED; urgency=low
+ apt (0.7.25.3) unstable; urgency=low
+ 
+   [ Christian Perrier ]
+   * Italian translation update. Closes: #567532
  
+   [ David Kalnischkies ]
    * apt-pkg/contrib/macros.h:
-     - move the header system.h with a new name to the public domain,
-       to be able to use it in other headers (Closes: #567662)
+     - install the header system.h with a new name to be able to use 
+       it in other headers (Closes: #567662)
    * cmdline/acqprogress.cc:
      - Set Mode to Medium so that the correct prefix is used.
        Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243)

diff --cc doc/examples/configure-index
Simple merge

diff --cc ftparchive/writer.cc
index b9dd554b3fa4ba97eb321823c3e446dc7e4a37a4,95b73a84da4ae9da348e99d96e02adfa62e13c98..18a3de0c250ac1f3f0ea252bb54499438c2b19a7
--- 1/ftparchive/writer.cc
--- 2/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@@ -89,9 -85,11 +85,11 @@@ int FTWScanner::ScannerFTW(const char *
  // FTWScanner::ScannerFile - File Scanner                             /*{{{*/
  // ---------------------------------------------------------------------
  /* */
 -int FTWScanner::ScannerFile(const char *File, bool ReadLink)
 +int FTWScanner::ScannerFile(const char *File, bool const &ReadLink)
  {
     const char *LastComponent = strrchr(File, '/');
+    char *RealPath = NULL;
+ 
     if (LastComponent == NULL)
        LastComponent = File;
     else
@@@ -148,8 -149,9 +149,9 @@@
  // FTWScanner::RecursiveScan - Just scan a directory tree             /*{{{*/
  // ---------------------------------------------------------------------
  /* */
 -bool FTWScanner::RecursiveScan(string Dir)
 +bool FTWScanner::RecursiveScan(string const &Dir)
  {
+    char *RealPath = NULL;
     /* If noprefix is set then jam the scan root in, so we don't generate
        link followed paths out of control */
     if (InternalPrefix.empty() == true)
@@@ -178,8 -181,9 +181,9 @@@
  // ---------------------------------------------------------------------
  /* This is an alternative to using FTW to locate files, it reads the list
     of files from another file. */
 -bool FTWScanner::LoadFileList(string Dir,string File)
 +bool FTWScanner::LoadFileList(string const &Dir, string const &File)
  {
+    char *RealPath = NULL;
     /* If noprefix is set then jam the scan root in, so we don't generate
        link followed paths out of control */
     if (InternalPrefix.empty() == true)

diff --cc ftparchive/writer.h
index ad58dee0aae7b76b5337ee2ff77d50036df174b7,9aaadbdab70e85f917586665ed04d13254ec66d2..520e91dd63739051fb7342197fe23bdac4275cd2
--- 1/ftparchive/writer.h
--- 2/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@@ -63,14 -62,13 +62,13 @@@ class FTWScanne
     string InternalPrefix;
  
     virtual bool DoPackage(string FileName) = 0;
 -   bool RecursiveScan(string Dir);
 -   bool LoadFileList(string BaseDir,string File);
 +   bool RecursiveScan(string const &Dir);
 +   bool LoadFileList(string const &BaseDir,string const &File);
     void ClearPatterns() { Patterns.clear(); };
 -   void AddPattern(string Pattern) { Patterns.push_back(Pattern); };
 -   bool SetExts(string Vals);
 +   void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
 +   bool SetExts(string const &Vals);
        
     FTWScanner();
-    virtual ~FTWScanner() {delete [] RealPath;};
  };
  
  class PackagesWriter : public FTWScanner