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

diff --combined cmdline/apt-get.cc
index e5e22e16635a7e31260acb0dca0f68740912cfe9,b150cf5418a1b84326f9268f29c8126822b1abb8..15373b0504791531123e3a480686a08051a9ab0a
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -49,6 -49,7 +49,7 @@@
  #include <apt-pkg/pkgsystem.h>
  #include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/indexfile.h>
+ #include <apt-pkg/upgrade.h>
  
  #include <apt-private/private-download.h>
  #include <apt-private/private-install.h>
@@@ -343,32 -344,6 +344,6 @@@ bool DoMarkAuto(CommandLine &CmdL
     return false;
  }
                                                                        /*}}}*/
- // DoDistUpgrade - Automatic smart upgrader                           /*{{{*/
- // ---------------------------------------------------------------------
- /* Intelligent upgrader that will install and remove packages at will */
- bool DoDistUpgrade(CommandLine &CmdL)
- {
-    CacheFile Cache;
-    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
-       return false;
- 
-    c0out << _("Calculating upgrade... ") << flush;
-    if (pkgDistUpgrade(*Cache) == false)
-    {
-       c0out << _("Failed") << endl;
-       ShowBroken(c1out,Cache,false);
-       return false;
-    }
-    
-    // parse additional cmdline pkg manipulation switches
-    if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
-       return false;
- 
-    c0out << _("Done") << endl;
-    
-    return InstallPackages(Cache,true);
- }
-                                                                       /*}}}*/
  // DoDSelectUpgrade - Do an upgrade by following dselects selections  /*{{{*/
  // ---------------------------------------------------------------------
  /* Follows dselect's selections */
@@@ -1598,7 -1573,7 +1573,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);