Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid

Conflicts:
	cmdline/apt-get.cc

diff --cc apt-private/private-upgrade.cc
index 0000000000000000000000000000000000000000,85b5a492a120b27f83b04b81d75e53cc3b4c0873..eb546e3e3dd6d45268081a2c519e5c1d96e100d0
mode 000000,100644..100644
--- /dev/null
--- 2/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@@ -1,0 -1,47 +1,53 @@@
+ 
+ #include <apt-pkg/algorithms.h>
+ 
+ #include "private-install.h"
+ #include "private-cachefile.h"
+ #include "private-upgrade.h"
+ #include "private-output.h"
+ 
+ 
+ // DoUpgradeNoNewPackages - Upgrade all packages                      /*{{{*/
+ // ---------------------------------------------------------------------
+ /* Upgrade all packages without installing new packages or erasing old
+    packages */
+ bool DoUpgradeNoNewPackages(CommandLine &CmdL)
+ {
++   if (CmdL.FileSize() != 1)
++      return _error->Error(_("The upgrade command takes no arguments"));
++
+    CacheFile Cache;
+    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
+       return false;
+ 
+    // Do the upgrade
+    if (pkgAllUpgrade(Cache) == false)
+    {
+       ShowBroken(c1out,Cache,false);
+       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
+    }
+    
+    return InstallPackages(Cache,true);
+ }
+                                                                       /*}}}*/
+ 
+ // DoSafeUpgrade - Upgrade all packages with install but not remove   /*{{{*/
+ bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL)
+ {
++   if (CmdL.FileSize() != 1)
++      return _error->Error(_("The upgrade command takes no arguments"));
++
+    CacheFile Cache;
+    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
+       return false;
+ 
+    // Do the upgrade
+    if (pkgAllUpgradeNoDelete(Cache) == false)
+    {
+       ShowBroken(c1out,Cache,false);
+       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
+    }
+    
+    return InstallPackages(Cache,true);
+ }
+                                                                       /*}}}*/

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

diff --cc debian/changelog
index 76e1bc1fb01c31431e8542ae6470b6b946f85f42,8e4def2b000b967f717244d713c9938f7f598c53..bd6357c62403f5da1c026a825d0132b549a2c037
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,3 +1,22 @@@
 +apt (0.9.11) UNRELEASED; urgency=low
 +
 +  [ Daniel Hartwig ]
 +  * Clarify units of Acquire::http::Dl-Limit (closes: #705445)
 +  * Show a error message if {,dist-}upgrade is used with additional
 +    arguments (closes: #705510)
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/config-clear:
 +    - support Configuration.Clear() for a clear of the entire 
 +      configuration
 +  * lp:~mvo/apt/add-glob-function:
 +    -  add Glob() to fileutl.{cc,h}
++  * feature/apt-binary2
++    - refactor large chunks of cmdline/*.cc into a new libapt-private
++      library that is shared between the internal apt cmdline tools
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Aug 2013 09:27:35 +0200
 +
  apt (0.9.10) unstable; urgency=low
  
    The "Hello to Debconf" upload