Merge remote-tracking branch 'upstream/debian/sid' into feature/upgrade-with-new

diff --combined apt-private/private-cmndline.cc
index b30eeffb74710bf37ccb561e786b192bf3e29b33,8902f07d5970a2416a4a15930990f120168538d5..121d72ede4a17d536bcd89e912f8d66d097c990a
--- 1/apt-private/private-cmndline.cc
--- 2/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -114,7 -114,7 +114,7 @@@ bool addArgumentsAPTConfig(std::vector<
  bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
  {
     if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
-           "deselect-upgrade", "autoremove"))
+           "dselect-upgrade", "autoremove"))
     {
        addArg(0, "dpkg-progress", "DpkgPM::Progress", 0);
        addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
@@@ -125,8 -125,7 +125,8 @@@
        addArg(0, "solver", "APT::Solver", CommandLine::HasArg);
        if (CmdMatches("upgrade"))
        {
 -       addArg(0, "allow-new", "APT::Get::UpgradeAllowNew", 0);
 +         addArg(0, "new-pkgs", "APT::Get::Upgrade-Allow-New", 
 +                CommandLine::Boolean);
        }
     }
     else if (CmdMatches("update"))

diff --combined cmdline/apt-get.cc
index 392eafe4fff01290433a161831394e6917b315ce,c273dfaaa61abbeb35bd394102a1949974f3b8aa..3a41b8c1fb9c81dd554abf9974d6a14d106a8478
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -350,9 -350,6 +350,6 @@@ bool DoMarkAuto(CommandLine &CmdL
  /* Intelligent upgrader that will install and remove packages at will */
  bool DoDistUpgrade(CommandLine &CmdL)
  {
-    if (CmdL.FileSize() != 1)
-       return _error->Error(_("The dist-upgrade command takes no arguments"));
- 
     CacheFile Cache;
     if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
        return false;
@@@ -365,6 -362,10 +362,10 @@@
        return false;
     }
     
+    // parse additional cmdline pkg manipulation switches
+    if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
+       return false;
+ 
     c0out << _("Done") << endl;
     
     return InstallPackages(Cache,true);
@@@ -1627,7 -1628,7 +1628,7 @@@ void SigWinch(int
  
  bool DoUpgrade(CommandLine &CmdL)
  {
 -   if (_config->FindB("APT::Get::UpgradeAllowNew", false) == true)
 +   if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true)
        return DoUpgradeWithAllowNewPackages(CmdL);
     else
        return DoUpgradeNoNewPackages(CmdL);