Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental

Conflicts:
	apt-private/private-install.cc

diff --cc apt-private/private-install.cc
index 3b94237b4f15bdeaaf3c6875d8c564d5dcecfe52,e08cd8057f1c0b8d3cc55b9bf2e88fa63dbd2285..55893bda05941e503611102b96e5cb68a7cbdf05
--- 1/apt-private/private-install.cc
--- 2/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@@ -19,8 -19,7 +19,8 @@@
  #include <apt-pkg/macros.h>
  #include <apt-pkg/packagemanager.h>
  #include <apt-pkg/pkgcache.h>
- #include <apt-pkg/sourcelist.h>
+ #include <apt-pkg/upgrade.h>
 +#include <apt-pkg/install-progress.h>
  
  #include <errno.h>
  #include <stdlib.h>
@@@ -700,10 -683,10 +709,10 @@@ bool DoInstall(CommandLine &CmdL
     if (Cache.OpenForInstall() == false || 
         Cache.CheckDeps(CmdL.FileSize() != 1) == false)
        return false;
 -
 +   
     std::map<unsigned short, APT::VersionSet> verset;
  
-    if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset))
+    if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset, 0))
        return false;
  
     /* Print out a list of packages that are going to be installed extra

diff --cc cmdline/apt-internal-solver.cc
Simple merge