Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

Conflicts:
	cmdline/apt.cc

diff --cc cmdline/apt.cc
index 60a83c7ceb544929d20964c7d185330b99110c93,5dbf868d79da83af354c9b5ea540c7453027b40d..b69aeef2d0a0b6d26e6b17d13e227a2c0d438861
--- 1/cmdline/apt.cc
--- 2/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@@ -119,9 -108,10 +108,10 @@@ int main(int argc, const char *argv[]
          return 100;
      }
  
-    // FIXME: move into a new libprivate/private-install.cc:Install()
-    _config->Set("DPkgPM::Progress-Fancy", "1");
-    _config->Set("Apt::Color", "1");
+     // some different defaults
 -   _config->CndSet("DPkgPM::Progress", "1");
++   _config->CndSet("DPkgPM::Progress-Fancy", "1");
+    _config->CndSet("Apt::Color", "1");
+    _config->CndSet("APT::Get::Upgrade-Allow-New", true);
  
     // Parse the command line and initialize the package library
     CommandLine CmdL(Args.data(), _config);

diff --cc doc/apt-verbatim.ent
Simple merge