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

diff --cc apt-private/private-cmndline.cc
Simple merge

diff --cc cmdline/apt-get.cc
index 630a948,3a41b8c..e5e22e1
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1596,9 -1625,10 +1596,9 @@@ void SigWinch(int
  #endif
  }
                                                                        /*}}}*/
 -
 -bool DoUpgrade(CommandLine &CmdL)
 +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);

diff --cc doc/apt-get.8.xml
Simple merge