* merged from the auto-install branch

diff --combined cmdline/apt-get.cc
index 4bd66383f6bc91c40790167bc92a24adb4ea9f4b,5e1ccb0c0bd150ad0e8355d545c58bc5353a0217..7b70de3bd8bd768a6e986dffbbb0bc8285510f26
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -629,8 -629,6 +629,8 @@@ void CacheFile::Sort(
     and verifies that the system is OK. */
  bool CacheFile::CheckDeps(bool AllowBroken)
  {
 +   bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false);
 +
     if (_error->PendingError() == true)
        return false;
  
@@@ -642,24 -640,12 +642,24 @@@
     if (pkgApplyStatus(*DCache) == false)
        return false;
     
 +   if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true)
 +   {
 +      FixBroken = true;
 +      if ((DCache->PolicyBrokenCount() > 0))
 +      {
 +       // upgrade all policy-broken packages with ForceImportantDeps=True
 +       for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++)
 +          if ((*DCache)[I].NowPolicyBroken() == true) 
 +             DCache->MarkInstall(I,true,0,false, true);
 +      }
 +   }
 +
     // Nothing is broken
     if (DCache->BrokenCount() == 0 || AllowBroken == true)
        return true;
  
     // Attempt to fix broken things
 -   if (_config->FindB("APT::Get::Fix-Broken",false) == true)
 +   if (FixBroken == true)
     {
        c1out << _("Correcting dependencies...") << flush;
        if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0)
@@@ -1160,11 -1146,9 +1160,11 @@@ bool TryToInstall(pkgCache::PkgIterato
     else
        ExpectedInst++;
     
 -   // Install it with autoinstalling enabled.
 -   if (State.InstBroken() == true && BrokenFix == false)
 +   // Install it with autoinstalling enabled (if we not respect the minial
 +   // required deps or the policy)
 +   if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false)
        Cache.MarkInstall(Pkg,true);
 +
     return true;
  }
                                                                        /*}}}*/
@@@ -1372,29 -1356,20 +1372,29 @@@ bool DoUpdate(CommandLine &CmdL
        return false;
  
     bool Failed = false;
 +   bool TransientNetworkFailure = false;
     for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
     {
        if ((*I)->Status == pkgAcquire::Item::StatDone)
         continue;
  
        (*I)->Finished();
 -      
 +
        fprintf(stderr,_("Failed to fetch %s  %s\n"),(*I)->DescURI().c_str(),
              (*I)->ErrorText.c_str());
 +
 +      if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) 
 +      {
 +       TransientNetworkFailure = true;
 +       continue;
 +      }
 +
        Failed = true;
     }
     
     // Clean out any old list files
 -   if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true)
 +   if (!TransientNetworkFailure &&
 +       _config->FindB("APT::Get::List-Cleanup",true) == true)
     {
        if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
          Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
@@@ -1406,11 -1381,9 +1406,11 @@@
     if (Cache.BuildCaches() == false)
        return false;
     
 -   if (Failed == true)
 +   if (TransientNetworkFailure == true)
 +      _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
 +   else if (Failed == true)
        return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
 -   
 +
     return true;
  }
                                                                        /*}}}*/
@@@ -1419,31 -1392,42 +1419,42 @@@
  /* Remove unused automatic packages */
  bool DoAutomaticRemove(CacheFile &Cache)
  {
-    if(_config->FindI("Debug::pkgAutoRemove",false))
+    bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
+    pkgDepCache::ActionGroup group(*Cache);
+ 
+    if(Debug)
        std::cout << "DoAutomaticRemove()" << std::endl;
  
     if (_config->FindB("APT::Get::Remove",true) == false)
        return _error->Error(_("We are not supposed to delete stuff, can't "
                             "start AutoRemover"));
  
+    string autoremovelist, autoremoveversions;
+    // look over the cache to see what can be removed
+    for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
     {
-      pkgDepCache::ActionGroup group(*Cache);
- 
-      // look over the cache to see what can be removed
-      for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
-        {
-        if (Cache[Pkg].Garbage)
-          {
-            if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
-              fprintf(stdout,"We could delete %s\n", Pkg.Name());
- 
-            if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles)
+       if (Cache[Pkg].Garbage)
+       {
+        if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
+           if(Debug)
+              std::cout << "We could delete %s" <<  Pkg.Name() << std::endl;
+          
+        autoremovelist += string(Pkg.Name()) + " ";
+        autoremoveversions += string(Cache[Pkg].CandVersion) + " ";
+        if (_config->FindB("APT::Get::AutomaticRemove")) 
+        {
+           if(Pkg.CurrentVer() != 0 && 
+              Pkg->CurrentState != pkgCache::State::ConfigFiles)
               Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false));
-            else
+           else
               Cache->MarkKeep(Pkg, false, false);
-          }
-        }
+        }
+       }
     }
+    ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
+    if (!_config->FindB("APT::Get::AutomaticRemove") && 
+        autoremovelist.size() > 0)
+       c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
  
     // Now see if we destroyed anything
     if (Cache->BrokenCount() != 0)
@@@ -1659,10 -1643,8 +1670,8 @@@ bool DoInstall(CommandLine &CmdL
         return _error->Error(_("Broken packages"));
        }   
     }
-    if (_config->FindB("APT::Get::AutomaticRemove")) {
-       if (!DoAutomaticRemove(Cache)) 
+    if (!DoAutomaticRemove(Cache)) 
         return false;
-    }
  
     /* Print out a list of packages that are going to be installed extra
        to what the user asked */
@@@ -2631,8 -2613,6 +2640,8 @@@ int main(int argc,const char *argv[]
        {0,"arch-only","APT::Get::Arch-Only",0},
        {0,"auto-remove","APT::Get::AutomaticRemove",0},
        {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
 +      {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
 +      {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
        {'c',"config-file",0,CommandLine::ConfigFile},
        {'o',"option",0,CommandLine::ArbItem},
        {0,0,0,0}};

diff --combined debian/rules
index 333d4ad5b802fe935a26e768d2c3b36ccaf7592f,6a142e759a32a5f784b5bffc5ee6abb6879e8976..ffc23402ece74a6758e21cf73ee21cefc57a0bf3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -210,15 -210,10 +210,15 @@@ apt: build debian/shlibs.loca
  
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
  
 -      cp share/debian-archive.gpg debian/$@/usr/share/$@
 +      cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
- 
+       cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
  #     head -n 500 ChangeLog > debian/ChangeLog
  
 +      # make rosetta happy and remove pot files in po/ (but leave stuff
 +      # in po/domains/* untouched) and cp *.po into each domain dir
 +      rm -f build/po/*.pot
 +      rm -f po/*.pot
 +
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ 
        dh_installcron -p$@

diff --combined methods/http.cc
index 09dab81881469c48280f45833c3ecdbfe810ceca,c6623c46f09cf97fcb67b1123f49df29e5b979db..1833f41efdbaf692213e9a926719ab20d1f43832
--- 1/methods/http.cc
--- 2/methods/http.cc
+++ b/methods/http.cc
@@@ -657,7 -657,7 +657,7 @@@ void HttpMethod::SendReq(FetchItem *Itm
        will glitch HTTP/1.0 proxies because they do not filter it out and 
        pass it on, HTTP/1.1 says the connection should default to keep alive
        and we expect the proxy to do this */
-    if (Proxy.empty() == true)
+    if (Proxy.empty() == true || Proxy.Host.empty())
        sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
              QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
     else
@@@ -714,7 -714,7 +714,7 @@@
        Req += string("Authorization: Basic ") + 
            Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
     
 -   Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";
 +   Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n";
     
     if (Debug == true)
        cerr << Req << endl;