merged lp:~donkult/apt/experimental

diff --combined apt-pkg/edsp.cc
index 44f7dbfd68bb9cb3f8ef53a7e7ae09407cfeb543,137398100673154eba3dd318f028c73a1a483ee8..791aac72f416364f149d133074e4fbf1747e93fb
--- 1/apt-pkg/edsp.cc
--- 2/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@@ -9,17 -9,24 +9,24 @@@
  
  #include <apt-pkg/edsp.h>
  #include <apt-pkg/error.h>
+ #include <apt-pkg/cacheset.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/policy.h>
  #include <apt-pkg/tagfile.h>
+ #include <apt-pkg/fileutl.h>
+ #include <apt-pkg/progress.h>
  
  #include <limits>
  #include <stdio.h>
  
+ #include <string>
+ 
  #include <apti18n.h>
                                                                        /*}}}*/
  
+ using std::string;
+ 
  // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
  const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
                                      "optional", "extra"};
@@@ -279,7 -286,7 +286,7 @@@ bool EDSP::ReadResponse(int const input
                        std::string msg = SubstVar(SubstVar(section.FindS("Message"), "\n .\n", "\n\n"), "\n ", "\n");
                        if (msg.empty() == true) {
                                msg = _("External solver failed without a proper error message");
--                              _error->Error(msg.c_str());
++                              _error->Error("%s", msg.c_str());
                        } else
                                _error->Error("External solver failed with: %s", msg.substr(0,msg.find('\n')).c_str());
                        if (Progress != NULL)

diff --combined debian/changelog
index a06abbbc08dfcb8864107da9584b8d562354b5b2,bda786e12a2d9a1df8325d1f495572378456a47f..27d1c7c07825e66664bfda7fe2049c573562030b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,36 +1,36 @@@
  apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
  
+   [ David Kalnischkies ]
+   * do not pollute namespace in the headers with using (Closes: #500198)
+   * use forward declaration in headers if possible instead of includes
+   * remove old APT_COMPATIBILITY ifdef's
+   * apt-pkg/deb/dpkgpm.cc:
+     - use std::vector instead of fixed size arrays to store args and
+       multiarch-packagename strings
+     - load the dpkg base arguments only one time and reuse them later
+   * cmdline/apt-get.cc:
+     - follow Provides in the evaluation of saving candidates, too, for
+       statisfying garbage package dependencies (Closes: #640590)
+   * apt-pkg/algorithms.cc:
+     - if a package is garbage, don't try to save it with FixByInstall
+   * apt-pkg/deb/debsrcrecords.cc:
+     - remove the limit of 400 Binaries for a source package (Closes: #622110)
+   * apt-pkg/deb/deblistparser.cc:
+     - fix crash when the dynamic mmap needs to be grown in
+       LoadReleaseInfo (LP: #854090)
+   * apt-pkg/deb/debmetaindex.cc:
+     - none is a separator, not a language: no need for Index (Closes: #624218)
+   * apt-pkg/aptconfiguration.cc:
+     - do not builtin languages only if none is forced (Closes: #643787)
+   * apt-pkg/pkgcachegen.cc:
+     - refactor MergeList by creating -Group, -Package and -Version specialist
+     - share description list between "same" versions (LP: #868977)
+       This also means that descriptions are shared across archives now.
+     - add implicit dependencies needed for Multi-Arch at the time a Version
+       struct is created and not at the end of the cache generation
+   * apt-pkg/pkgcache.cc:
+     - always prefer "en" over "" for "en"-language regardless of cache-order
+ 
    [ Michael Vogt ]
    * apt-pkg/contrib/configuration.cc:
      - fix double delete (LP: #848907)
@@@ -8,17 -39,12 +39,12 @@@
      - fix fetching language information by adding OptionalSubIndexTarget
    * methods/https.cc:
      - cleanup broken downloads properly
-   
+ 
    [ Colin Watson ]
    * ftparchive/cachedb.cc:
      - fix buffersize in bytes2hex
  
-   [ David Kalnischkies ]  
-   * apt-pkg/deb/deblistparser.cc:
-     - fix crash when the dynamic mmap needs to be grown in
-       LoadReleaseInfo (LP: #854090)
- 
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Oct 2011 18:14:11 +0200
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Oct 2011 22:27:18 +0200
++ -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
  
  apt (0.8.16~exp6) experimental; urgency=low