From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 11 Aug 2006 10:45:33 +0000 (+0200)
Subject: * merged the apt--install-recommends branch
X-Git-Tag: 0.7.24ubuntu1~246
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2ae2e04d97028b558bfe954e55a80513e0202889?hp=-c

* merged the apt--install-recommends branch
* ABI break, bumped the version number
---

2ae2e04d97028b558bfe954e55a80513e0202889
diff --combined apt-pkg/depcache.cc
index 27b6134b4,bfcb8e0eb..abe2842cc
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -16,52 -16,15 +16,52 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/algorithms.h>
 +
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/configuration.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/tagfile.h>
 +
 +#include <iostream>
 +#include <sstream>    
 +#include <set>
 +
  #include <apti18n.h>    
 -									/*}}}*/
 +
 +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
 +  cache(cache), released(false)
 +{
 +  ++cache.group_level;
 +}
 +
 +void pkgDepCache::ActionGroup::release()
 +{
 +  if(!released)
 +    {
 +      if(cache.group_level == 0)
 +	std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
 +      else
 +	{
 +	  --cache.group_level;
 +
 +	  if(cache.group_level == 0)
 +	    cache.MarkAndSweep();
 +	}
 +
 +      released = false;
 +    }
 +}
 +
 +pkgDepCache::ActionGroup::~ActionGroup()
 +{
 +  release();
 +}
  
  // DepCache::pkgDepCache - Constructors					/*{{{*/
  // ---------------------------------------------------------------------
  /* */
  pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
 -                Cache(pCache), PkgState(0), DepState(0)
 +  group_level(0), Cache(pCache), PkgState(0), DepState(0)
  {
     delLocalPolicy = 0;
     LocalPolicy = Plcy;
@@@ -84,10 -47,6 +84,10 @@@ pkgDepCache::~pkgDepCache(
  /* This allocats the extension buffers and initializes them. */
  bool pkgDepCache::Init(OpProgress *Prog)
  {
 +   // Suppress mark updates during this operation (just in case) and
 +   // run a mark operation when Init terminates.
 +   ActionGroup actions(*this);
 +
     delete [] PkgState;
     delete [] DepState;
     PkgState = new StateCache[Head().PackageCount];
@@@ -113,7 -72,7 +113,7 @@@
        // Find the proper cache slot
        StateCache &State = PkgState[I->ID];
        State.iFlags = 0;
 -      
 +
        // Figure out the install version
        State.CandidateVer = GetCandidateVer(I);
        State.InstallVer = I.CurrentVer();
@@@ -135,130 -94,11 +135,130 @@@
  
     if(Prog != 0)
        Prog->Done();
 -   
 +
     return true;
  } 
  									/*}}}*/
  
 +bool pkgDepCache::readStateFile(OpProgress *Prog)
 +{
 +   FileFd state_file;
 +   string state = _config->FindDir("Dir::State") + "extended_states";
 +   if(FileExists(state)) {
 +      state_file.Open(state, FileFd::ReadOnly);
 +      int file_size = state_file.Size();
 +      if(Prog != NULL)
 +	 Prog->OverallProgress(0, file_size, 1, 
 +			       _("Reading state information"));
 +
 +      pkgTagFile tagfile(&state_file);
 +      pkgTagSection section;
 +      int amt=0;
 +      while(tagfile.Step(section)) {
 +	 string pkgname = section.FindS("Package");
 +	 pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
 +	 // Silently ignore unknown packages and packages with no actual
 +	 // version.
 +	 if(!pkg.end() && !pkg.VersionList().end()) {
 +	    short reason = section.FindI("Auto-Installed", 0);
 +	    if(reason > 0)
 +	       PkgState[pkg->ID].Flags  |= Flag::Auto;
 +	    if(_config->FindB("Debug::pkgAutoRemove",false))
 +	       std::cout << "Auto-Installed : " << pkgname << std::endl;
 +	    amt+=section.size();
 +	    if(Prog != NULL)
 +	       Prog->OverallProgress(amt, file_size, 1, 
 +				     _("Reading state information"));
 +	 }
 +	 if(Prog != NULL)
 +	    Prog->OverallProgress(file_size, file_size, 1, 
 +				  _("Reading state information"));
 +      }
 +   }
 +
 +   return true;
 +}
 +
 +bool pkgDepCache::writeStateFile(OpProgress *prog)
 +{
 +   if(_config->FindB("Debug::pkgAutoRemove",false))
 +      std::clog << "pkgDepCache::writeStateFile()" << std::endl;
 +
 +   FileFd StateFile;
 +   string state = _config->FindDir("Dir::State") + "extended_states";
 +
 +   // if it does not exist, create a empty one
 +   if(!FileExists(state)) 
 +   {
 +      StateFile.Open(state, FileFd::WriteEmpty);
 +      StateFile.Close();
 +   }
 +
 +   // open it
 +   if(!StateFile.Open(state, FileFd::ReadOnly))
 +      return _error->Error(_("Failed to open StateFile %s"),
 +			   state.c_str());
 +
 +   FILE *OutFile;
 +   string outfile = state + ".tmp";
 +   if((OutFile = fopen(outfile.c_str(),"w")) == NULL)
 +      return _error->Error(_("Failed to write temporary StateFile %s"),
 +			   outfile.c_str());
 +
 +   // first merge with the existing sections
 +   pkgTagFile tagfile(&StateFile);
 +   pkgTagSection section;
 +   std::set<string> pkgs_seen;
 +   const char *nullreorderlist[] = {0};
 +   while(tagfile.Step(section)) {
 +	 string pkgname = section.FindS("Package");
 +	 // Silently ignore unknown packages and packages with no actual
 +	 // version.
 +	 pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
 +	 if(pkg.end() || pkg.VersionList().end()) 
 +	    continue;
 +	 bool oldAuto = section.FindI("Auto-Installed");
 +	 bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
 +	 if(_config->FindB("Debug::pkgAutoRemove",false))
 +	    std::clog << "Update exisiting AutoInstall info: " 
 +		      << pkg.Name() << std::endl;
 +	 TFRewriteData rewrite[2];
 +	 rewrite[0].Tag = "Auto-Installed";
 +	 rewrite[0].Rewrite = newAuto ? "1" : "0";
 +	 rewrite[0].NewTag = 0;
 +	 rewrite[1].Tag = 0;
 +	 TFRewrite(OutFile, section, nullreorderlist, rewrite);
 +	 fprintf(OutFile,"\n");
 +	 pkgs_seen.insert(pkgname);
 +   }
 +   
 +   // then write the ones we have not seen yet
 +   std::ostringstream ostr;
 +   for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) {
 +      if(PkgState[pkg->ID].Flags & Flag::Auto) {
 +	 if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) {
 +	    if(_config->FindB("Debug::pkgAutoRemove",false))
 +	       std::clog << "Skipping already written " << pkg.Name() << std::endl;
 +	    continue;
 +	 }
 +	 if(_config->FindB("Debug::pkgAutoRemove",false))
 +	    std::clog << "Writing new AutoInstall: " 
 +		      << pkg.Name() << std::endl;
 +	 ostr.str(string(""));
 +	 ostr << "Package: " << pkg.Name() 
 +	      << "\nAuto-Installed: 1\n\n";
 +	 fprintf(OutFile,ostr.str().c_str());
 +	 fprintf(OutFile,"\n");
 +      }
 +   }
 +   fclose(OutFile);
 +
 +   // move the outfile over the real file
 +   rename(outfile.c_str(), state.c_str());
 +
 +   return true;
 +}
 +
  // DepCache::CheckDep - Checks a single dependency			/*{{{*/
  // ---------------------------------------------------------------------
  /* This first checks the dependency against the main target package and
@@@ -399,9 -239,11 +399,11 @@@ void pkgDepCache::AddStates(const PkgIt
  {
     StateCache &State = PkgState[Pkg->ID];
     
-    // The Package is broken
+    // The Package is broken (either minimal dep or policy dep)
     if ((State.DepState & DepInstMin) != DepInstMin)
        iBrokenCount += Add;
+    if ((State.DepState & DepInstPolicy) != DepInstPolicy)
+       iPolicyBrokenCount += Add;
     
     // Bad state
     if (Pkg.State() != PkgIterator::NeedsNothing)
@@@ -612,14 -454,12 +614,14 @@@ void pkgDepCache::Update(OpProgress *Pr
  
     if (Prog != 0)      
        Prog->Progress(Done);
 +
 +   readStateFile(Prog);
  }
  									/*}}}*/
  // DepCache::Update - Update the deps list of a package	   		/*{{{*/
  // ---------------------------------------------------------------------
  /* This is a helper for update that only does the dep portion of the scan. 
 -   It is mainly ment to scan reverse dependencies. */
 +   It is mainly meant to scan reverse dependencies. */
  void pkgDepCache::Update(DepIterator D)
  {
     // Update the reverse deps
@@@ -671,7 -511,7 +673,7 @@@ void pkgDepCache::Update(PkgIterator co
  // DepCache::MarkKeep - Put the package in the keep state		/*{{{*/
  // ---------------------------------------------------------------------
  /* */
 -void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
 +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
  {
     // Simplifies other routines.
     if (Pkg.end() == true)
@@@ -683,9 -523,6 +685,9 @@@
         Pkg.CurrentVer().Downloadable() == false)
        return;
     
 +   /** \todo Can this be moved later in the method? */
 +   ActionGroup group(*this);
 +
     /* We changed the soft state all the time so the UI is a bit nicer
        to use */
     StateCache &P = PkgState[Pkg->ID];
@@@ -702,8 -539,7 +704,8 @@@
     if (Pkg->VersionList == 0)
        return;
     
 -   P.Flags &= ~Flag::Auto;
 +   if(FromUser && !P.Marked)
 +     P.Flags &= ~Flag::Auto;
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
  
@@@ -729,8 -565,6 +731,8 @@@ void pkgDepCache::MarkDelete(PkgIterato
     if (Pkg.end() == true)
        return;
  
 +   ActionGroup group(*this);
 +
     // Check that it is not already marked for delete
     StateCache &P = PkgState[Pkg->ID];
     P.iFlags &= ~(AutoKept | Purge);
@@@ -753,6 -587,7 +755,6 @@@
     else
        P.Mode = ModeDelete;
     P.InstallVer = 0;
 -   P.Flags &= Flag::Auto;
  
     AddStates(Pkg);   
     Update(Pkg);
@@@ -763,7 -598,7 +765,8 @@@
  // ---------------------------------------------------------------------
  /* */
  void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
- 			      unsigned long Depth, bool FromUser)
 -			      unsigned long Depth, bool ForceImportantDeps)
++			      unsigned long Depth, bool FromUser,
++			      bool ForceImportantDeps)
  {
     if (Depth > 100)
        return;
@@@ -772,8 -607,6 +775,8 @@@
     if (Pkg.end() == true)
        return;
     
 +   ActionGroup group(*this);
 +
     /* Check that it is not already marked for install and that it can be 
        installed */
     StateCache &P = PkgState[Pkg->ID];
@@@ -783,7 -616,7 +786,7 @@@
  	P.CandidateVer == (Version *)Pkg.CurrentVer()))
     {
        if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
 -	 MarkKeep(Pkg);
 +	 MarkKeep(Pkg, false, FromUser);
        return;
     }
  
@@@ -801,20 -634,7 +804,20 @@@
     
     P.Mode = ModeInstall;
     P.InstallVer = P.CandidateVer;
 -   P.Flags &= ~Flag::Auto;
 +
 +   if(FromUser)
 +     {
 +       // Set it to manual if it's a new install or cancelling the
 +       // removal of a garbage package.
 +       if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked))
 +	 P.Flags &= ~Flag::Auto;
 +     }
 +   else
 +     {
 +       // Set it to auto if this is a new install.
 +       if(P.Status == 2)
 +	 P.Flags |= Flag::Auto;
 +     }
     if (P.CandidateVer == (Version *)Pkg.CurrentVer())
        P.Mode = ModeKeep;
         
@@@ -846,24 -666,26 +849,26 @@@
  
        /* Check if this dep should be consider for install. If it is a user
           defined important dep and we are installed a new package then 
- 	 it will be installed. Otherwise we only worry about critical deps */
+ 	 it will be installed. Otherwise we only check for important
+          deps that have changed from the installed version
+       */
        if (IsImportantDep(Start) == false)
  	 continue;
- 
+       
        /* check if any ImportantDep() (but not Critial) where added
-        * since we installed the thing
+        * since we installed the package
         */
        bool isNewImportantDep = false;
-       if(IsImportantDep(Start) && !Start.IsCritical())
+       if(!ForceImportantDeps && !Start.IsCritical())
        {
  	 bool found=false;
  	 VerIterator instVer = Pkg.CurrentVer();
- 	 for (DepIterator D = instVer.DependsList(); !D.end(); D++)
+ 	 for (DepIterator D = instVer.DependsList(); D.end() != true; D++)
  	 {
  	    //FIXME: deal better with or-groups(?)
  	    DepIterator LocalStart = D;
  	    
- 	    if(IsImportantDep(Dep) && Start.TargetPkg() == D.TargetPkg())
+ 	    if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg())
  	       found=true;
  	 }
  	 // this is a new dep if it was not found to be already
@@@ -875,7 -697,9 +880,9 @@@
  	    std::clog << "new important dependency: " 
  		      << Start.TargetPkg().Name() << std::endl;
  
-       if (Pkg->CurrentVer != 0 && Start.IsCritical() == false && !isNewImportantDep)
+       // skip important deps if the package is already installed
+       if (Pkg->CurrentVer != 0 && Start.IsCritical() == false 
+ 	  && !isNewImportantDep && !ForceImportantDeps)
  	 continue;
        
        /* If we are in an or group locate the first or that can 
@@@ -917,14 -741,19 +924,18 @@@
  	    }
  	 }
  	 
 -	 if (InstPkg.end() == false)
 +	 if (InstPkg.end() == false) 
  	 {
  	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
  	       std::clog << "Installing " << InstPkg.Name() 
  			 << " as dep of " << Pkg.Name() 
  			 << std::endl;
- 	   MarkInstall(InstPkg, true, Depth + 1, false);
 -	    MarkInstall(InstPkg,true,Depth + 1, ForceImportantDeps);
++	    MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
+ 
+ 	    // Set the autoflag, after MarkInstall because MarkInstall unsets it
+ 	    if (P->CurrentVer == 0)
+ 	       PkgState[InstPkg->ID].Flags |= Flag::Auto;
  	 }
 -	 
  	 continue;
        }
        
@@@ -938,6 -767,7 +949,6 @@@
  	    PkgIterator Pkg = Ver.ParentPkg();
        
  	    MarkDelete(Pkg);
 -	    PkgState[Pkg->ID].Flags |= Flag::Auto;
  	 }
  	 continue;
        }      
@@@ -949,8 -779,6 +960,8 @@@
  /* */
  void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
  {
 +   ActionGroup group(*this);
 +
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
     
@@@ -969,11 -797,9 +980,11 @@@
  /* */
  void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
  {
 +   ActionGroup group(*this);
 +
     pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
     StateCache &P = PkgState[Pkg->ID];
 -   
 +
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
  
@@@ -986,18 -812,6 +997,18 @@@
     Update(Pkg);
     AddSizes(Pkg);
  }
 +
 +void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto)
 +{
 +  StateCache &state = PkgState[Pkg->ID];
 +
 +  ActionGroup group(*this);
 +
 +  if(Auto)
 +    state.Flags |= Flag::Auto;
 +  else
 +    state.Flags &= ~Flag::Auto;
 +}
  									/*}}}*/
  // StateCache::Update - Compute the various static display things	/*{{{*/
  // ---------------------------------------------------------------------
@@@ -1080,221 -894,6 +1091,221 @@@ pkgCache::VerIterator pkgDepCache::Poli
     return Last;
  }
  									/*}}}*/
 +									/*}}}*/
 +
 +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
 +  : constructedSuccessfully(false)
 +{
 +  Configuration::Item const *Opts;
 +  Opts = _config->Tree("APT::NeverAutoRemove");
 +  if (Opts != 0 && Opts->Child != 0)
 +    {
 +      Opts = Opts->Child;
 +      for (; Opts != 0; Opts = Opts->Next)
 +	{
 +	  if (Opts->Value.empty() == true)
 +	    continue;
 +
 +	  regex_t *p = new regex_t;
 +	  if(regcomp(p,Opts->Value.c_str(),
 +		     REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
 +	    {
 +	      regfree(p);
 +	      delete p;
 +	      _error->Error("Regex compilation error for APT::NeverAutoRemove");
 +	      return;
 +	    }
 +
 +	  rootSetRegexp.push_back(p);
 +	}
 +    }
 +
 +  constructedSuccessfully = true;
 +}
 +
 +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
 +{
 +  for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
 +    {
 +      regfree(rootSetRegexp[i]);
 +      delete rootSetRegexp[i];
 +    }
 +}
 +
 +
 +bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg)
 +{
 +   for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
 +      if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0)
 +	 return true;
 +
 +   return false;
 +}
 +
 +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
 +{
 +  DefaultRootSetFunc *f = new DefaultRootSetFunc;
 +  if(f->wasConstructedSuccessfully())
 +    return f;
 +  else
 +    {
 +      delete f;
 +      return NULL;
 +    }
 +}
 +
 +bool pkgDepCache::MarkFollowsRecommends()
 +{
 +  return _config->FindB("APT::AutoRemove::RecommendsImportant", true);
 +}
 +
 +bool pkgDepCache::MarkFollowsSuggests()
 +{
 +  return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
 +}
 +
 +// the main mark algorithm
 +bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
 +{
 +   bool follow_recommends;
 +   bool follow_suggests;
 +
 +   // init the states
 +   for(PkgIterator p = PkgBegin(); !p.end(); ++p)
 +   {
 +      PkgState[p->ID].Marked  = false;
 +      PkgState[p->ID].Garbage = false;
 +
 +      // debug output
 +      if(_config->FindB("Debug::pkgAutoRemove",false) 
 +	 && PkgState[p->ID].Flags & Flag::Auto)
 +  	 std::clog << "AutoDep: " << p.Name() << std::endl;
 +   }
 +
 +   // init vars
 +   follow_recommends = MarkFollowsRecommends();
 +   follow_suggests   = MarkFollowsSuggests();
 +
 +
 +
 +   // do the mark part, this is the core bit of the algorithm
 +   for(PkgIterator p = PkgBegin(); !p.end(); ++p)
 +   {
 +      if(!(PkgState[p->ID].Flags & Flag::Auto) ||
 +	  (p->Flags & Flag::Essential) ||
 +	  userFunc.InRootSet(p))
 +          
 +      {
 +	 // the package is installed (and set to keep)
 +	 if(PkgState[p->ID].Keep() && !p.CurrentVer().end())
 +	    MarkPackage(p, p.CurrentVer(),
 +			follow_recommends, follow_suggests);
 +	 // the package is to be installed 
 +	 else if(PkgState[p->ID].Install())
 +	    MarkPackage(p, PkgState[p->ID].InstVerIter(*this),
 +			follow_recommends, follow_suggests);
 +      }
 +   }
 +
 +   return true;
 +}
 +
 +// mark a single package in Mark-and-Sweep
 +void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
 +			      const pkgCache::VerIterator &ver,
 +			      bool follow_recommends,
 +			      bool follow_suggests)
 +{
 +   pkgDepCache::StateCache &state = PkgState[pkg->ID];
 +   VerIterator candver            = state.CandidateVerIter(*this);
 +   VerIterator instver            = state.InstVerIter(*this);
 +
 +#if 0
 +   // If a package was garbage-collected but is now being marked, we
 +   // should re-select it 
 +   // For cases when a pkg is set to upgrade and this trigger the
 +   // removal of a no-longer used dependency.  if the pkg is set to
 +   // keep again later it will result in broken deps
 +   if(state.Delete() && state.RemoveReason = Unused) 
 +   {
 +      if(ver==candver)
 +	 mark_install(pkg, false, false, NULL);
 +      else if(ver==pkg.CurrentVer())
 +	 MarkKeep(pkg, false, false);
 +      
 +      instver=state.InstVerIter(*this);
 +   }
 +#endif
 +
 +   // Ignore versions other than the InstVer, and ignore packages
 +   // that are already going to be removed or just left uninstalled.
 +   if(!(ver == instver && !instver.end()))
 +      return;
 +
 +   // if we are marked already we are done
 +   if(state.Marked)
 +      return;
 +
 +   //std::cout << "Setting Marked for: " << pkg.Name() << std::endl;
 +   state.Marked=true;
 +
 +   if(!ver.end())
 +   {
 +     for(DepIterator d = ver.DependsList(); !d.end(); ++d)
 +     {
 +	if(d->Type == Dep::Depends ||
 +	   d->Type == Dep::PreDepends ||
 +	   (follow_recommends &&
 +	    d->Type == Dep::Recommends) ||
 +	   (follow_suggests &&
 +	    d->Type == Dep::Suggests))
 +        {
 +	   // Try all versions of this package.
 +	   for(VerIterator V = d.TargetPkg().VersionList(); 
 +	       !V.end(); ++V)
 +	   {
 +	      if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
 +	      {
 +		 MarkPackage(V.ParentPkg(), V, 
 +			     follow_recommends, follow_suggests);
 +	      }
 +	   }
 +	   // Now try virtual packages
 +	   for(PrvIterator prv=d.TargetPkg().ProvidesList(); 
 +	       !prv.end(); ++prv)
 +	   {
 +	      if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, 
 +				       d.TargetVer()))
 +	      {
 +		 MarkPackage(prv.OwnerPkg(), prv.OwnerVer(),
 +			     follow_recommends, follow_suggests);
 +	      }
 +	   }
 +	}
 +     }
 +   }
 +}
 +
 +bool pkgDepCache::Sweep()
 +{
 +   // do the sweep
 +   for(PkgIterator p=PkgBegin(); !p.end(); ++p)
 +  {
 +     StateCache &state=PkgState[p->ID];
 +
 +     // if it is not marked and it is installed, it's garbage 
 +     if(!state.Marked && (!p.CurrentVer().end() || state.Install()) &&
 +	!state.Delete())
 +     {
 +	state.Garbage=true;
 +	if(_config->FindB("Debug::pkgAutoRemove",false))
 +	   std::cout << "Garbage: " << p.Name() << std::endl;
 +     }
 +  }   
 +
 +   return true;
 +}
 +
  // Policy::IsImportantDep - True if the dependency is important		/*{{{*/
  // ---------------------------------------------------------------------
  /* */
diff --combined apt-pkg/depcache.h
index d16b56bbc,042abb5cc..5cd5ea354
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@@ -1,4 -1,4 +1,4 @@@
 -// -*- mode: cpp; mode: fold -*-
 +// -*- mode: c++; mode: fold -*-
  // Description								/*{{{*/
  // $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
  /* ######################################################################
@@@ -45,71 -45,9 +45,71 @@@
  #include <apt-pkg/pkgcache.h>
  #include <apt-pkg/progress.h>
  
 +#include <regex.h>
 +
 +#include <vector>
 +
  class pkgDepCache : protected pkgCache::Namespace
  {
     public:
 +
 +   /** \brief An arbitrary predicate on packages. */
 +   class InRootSetFunc
 +   {
 +   public:
 +     virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;};
 +     virtual ~InRootSetFunc() {};
 +   };
 +
 +   private:
 +   /** \brief Mark a single package and all its unmarked important
 +    *  dependencies during mark-and-sweep.
 +    *
 +    *  Recursively invokes itself to mark all dependencies of the
 +    *  package.
 +    *
 +    *  \param pkg The package to mark.
 +    *
 +    *  \param ver The version of the package that is to be marked.
 +    *
 +    *  \param follow_recommends If \b true, recommendations of the
 +    *  package will be recursively marked.
 +    *
 +    *  \param follow_suggests If \b true, suggestions of the package
 +    *  will be recursively marked.
 +    */
 +   void MarkPackage(const pkgCache::PkgIterator &pkg,
 +		    const pkgCache::VerIterator &ver,
 +		    bool follow_recommends,
 +		    bool follow_suggests);
 +
 +   /** \brief Update the Marked field of all packages.
 +    *
 +    *  Each package's StateCache::Marked field will be set to \b true
 +    *  if and only if it can be reached from the root set.  By
 +    *  default, the root set consists of the set of manually installed
 +    *  or essential packages, but it can be extended using the
 +    *  parameter #rootFunc.
 +    *
 +    *  \param rootFunc A callback that can be used to add extra
 +    *  packages to the root set.
 +    *
 +    *  \return \b false if an error occured.
 +    */
 +   bool MarkRequired(InRootSetFunc &rootFunc);
 +
 +   /** \brief Set the StateCache::Garbage flag on all packages that
 +    *  should be removed.
 +    *
 +    *  Packages that were not marked by the last call to #MarkRequired
 +    *  are tested to see whether they are actually garbage.  If so,
 +    *  they are marked as such.
 +    *
 +    *  \return \b false if an error occured.
 +    */
 +   bool Sweep();
 +
 +   public:
     
     // These flags are used in DepState
     enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2),
@@@ -125,84 -63,6 +125,84 @@@
        
     enum VersionTypes {NowVersion, InstallVersion, CandidateVersion};
     enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2};
 +
 +   /** \brief Represents an active action group.
 +    *
 +    *  An action group is a group of actions that are currently being
 +    *  performed.  While an active group is active, certain routine
 +    *  clean-up actions that would normally be performed after every
 +    *  cache operation are delayed until the action group is
 +    *  completed.  This is necessary primarily to avoid inefficiencies
 +    *  when modifying a large number of packages at once.
 +    *
 +    *  This class represents an active action group.  Creating an
 +    *  instance will create an action group; destroying one will
 +    *  destroy the corresponding action group.
 +    *
 +    *  The following operations are suppressed by this class:
 +    *
 +    *    - Keeping the Marked and Garbage flags up to date.
 +    *
 +    *  \note This can be used in the future to easily accumulate
 +    *  atomic actions for undo or to display "what apt did anyway";
 +    *  e.g., change the counter of how many action groups are active
 +    *  to a std::set of pointers to them and use those to store
 +    *  information about what happened in a group in the group.
 +    */
 +   class ActionGroup
 +   {
 +       pkgDepCache &cache;
 +
 +       bool released;
 +
 +       /** Action groups are noncopyable. */
 +       ActionGroup(const ActionGroup &other);
 +   public:
 +       /** \brief Create a new ActionGroup.
 +	*
 +	*  \param cache The cache that this ActionGroup should
 +	*  manipulate.
 +	*
 +	*  As long as this object exists, no automatic cleanup
 +	*  operations will be undertaken.
 +	*/
 +       ActionGroup(pkgDepCache &cache);
 +
 +       /** \brief Clean up the action group before it is destroyed.
 +        *
 +        *  If it is destroyed later, no second cleanup wil be run.
 +	*/
 +       void release();
 +
 +       /** \brief Destroy the action group.
 +	*
 +	*  If this is the last action group, the automatic cache
 +	*  cleanup operations will be undertaken.
 +	*/
 +       ~ActionGroup();
 +   };
 +
 +   /** \brief Returns \b true for packages matching a regular
 +    *  expression in APT::NeverAutoRemove.
 +    */
 +   class DefaultRootSetFunc : public InRootSetFunc
 +   {
 +     std::vector<regex_t *> rootSetRegexp;
 +     bool constructedSuccessfully;
 +
 +   public:
 +     DefaultRootSetFunc();
 +     ~DefaultRootSetFunc();
 +
 +     /** \return \b true if the class initialized successfully, \b
 +      *  false otherwise.  Used to avoid throwing an exception, since
 +      *  APT classes generally don't.
 +      */
 +     bool wasConstructedSuccessfully() const { return constructedSuccessfully; }
 +
 +     bool InRootSet(const pkgCache::PkgIterator &pkg);
 +   };
 +
     struct StateCache
     {
        // Epoch stripped text versions of the two version fields
@@@ -219,17 -79,6 +219,17 @@@
        unsigned short Flags;
        unsigned short iFlags;           // Internal flags
  
 +      /** \brief \b true if this package can be reached from the root set. */
 +      bool Marked;
 +
 +      /** \brief \b true if this package is unused and should be removed.
 +       *
 +       *  This differs from !#Marked, because it is possible that some
 +       *  unreachable packages will be protected from becoming
 +       *  garbage.
 +       */
 +      bool Garbage;
 +
        // Various tree indicators
        signed char Status;              // -1,0,1,2
        unsigned char Mode;              // ModeList
@@@ -248,6 -97,7 +248,7 @@@
        inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
        inline bool Held() const {return Status != 0 && Keep();};
        inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};
+       inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;};
        inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
        inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};
        inline bool Install() const {return Mode == ModeInstall;};
@@@ -271,14 -121,6 +272,14 @@@
        
        virtual ~Policy() {};
     };
 +
 +   private:
 +   /** The number of open "action groups"; certain post-action
 +    *  operations are suppressed if this number is > 0.
 +    */
 +   int group_level;
 +
 +   friend class ActionGroup;
       
     protected:
  
@@@ -293,6 -135,7 +294,7 @@@
     unsigned long iDelCount;
     unsigned long iKeepCount;
     unsigned long iBrokenCount;
+    unsigned long iPolicyBrokenCount;
     unsigned long iBadCount;
     
     Policy *delLocalPolicy;           // For memory clean up..
@@@ -342,68 -185,16 +344,69 @@@
     inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];};
     inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];};
  
 -   // Manipulators
 -   void MarkKeep(PkgIterator const &Pkg,bool Soft = false);
 +   /** \return A function identifying packages in the root set other
 +    *  than manually installed packages and essential packages, or \b
 +    *  NULL if an error occurs.
 +    *
 +    *  \todo Is this the best place for this function?  Perhaps the
 +    *  settings for mark-and-sweep should be stored in a single
 +    *  external class?
 +    */
 +   virtual InRootSetFunc *GetRootSetFunc();
 +
 +   /** \return \b true if the garbage collector should follow recommendations.
 +    */
 +   virtual bool MarkFollowsRecommends();
 +
 +   /** \return \b true if the garbage collector should follow suggestions.
 +    */
 +   virtual bool MarkFollowsSuggests();
 +
 +   /** \brief Update the Marked and Garbage fields of all packages.
 +    *
 +    *  This routine is implicitly invoked after all state manipulators
 +    *  and when an ActionGroup is destroyed.  It invokes #MarkRequired
 +    *  and #Sweep to do its dirty work.
 +    *
 +    *  \param rootFunc A predicate that returns \b true for packages
 +    *  that should be added to the root set.
 +    */
 +   bool MarkAndSweep(InRootSetFunc &rootFunc)
 +   {
 +     return MarkRequired(rootFunc) && Sweep();
 +   }
 +
 +   bool MarkAndSweep()
 +   {
 +     std::auto_ptr<InRootSetFunc> f(GetRootSetFunc());
 +     if(f.get() != NULL)
 +       return MarkAndSweep(*f.get());
 +     else
 +       return false;
 +   }
 +
 +   /** \name State Manipulators
 +    */
 +   // @{
 +   void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
 +		 bool FromUser = true);
     void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
     void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
- 		    unsigned long Depth = 0, bool FromUser = true);
 -		    unsigned long Depth = 0, bool ForceImportantDeps = false);
++		    unsigned long Depth = 0, bool FromUser = true,
++		    bool ForceImportantDeps = false);
     void SetReInstall(PkgIterator const &Pkg,bool To);
     void SetCandidateVersion(VerIterator TargetVer);
 +
 +   /** Set the "is automatically installed" flag of Pkg. */
 +   void MarkAuto(const PkgIterator &Pkg, bool Auto);
 +   // @}
     
     // This is for debuging
     void Update(OpProgress *Prog = 0);
 +
 +   // read persistent states
 +   bool readStateFile(OpProgress *prog);
 +   bool writeStateFile(OpProgress *prog);
     
     // Size queries
     inline double UsrSize() {return iUsrSize;};
@@@ -412,6 -203,7 +415,7 @@@
     inline unsigned long KeepCount() {return iKeepCount;};
     inline unsigned long InstCount() {return iInstCount;};
     inline unsigned long BrokenCount() {return iBrokenCount;};
+    inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;};
     inline unsigned long BadCount() {return iBadCount;};
  
     bool Init(OpProgress *Prog);
diff --combined apt-pkg/init.h
index 0c6260c2f,8255b406a..b036b8609
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -18,7 -18,7 +18,7 @@@
  
  // See the makefile
  #define APT_PKG_MAJOR 3
- #define APT_PKG_MINOR 50
 -#define APT_PKG_MINOR 11
++#define APT_PKG_MINOR 51
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;
diff --combined apt-pkg/makefile
index d03a19182,7e5feae53..6cc1414b2
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
- MAJOR=3.50
 -MAJOR=3.11
++MAJOR=3.51
  MINOR=0
  SLIBS=$(PTHREADLIB) $(INTLLIBS)
  APT_DOMAIN:=libapt-pkg$(MAJOR)
diff --combined cmdline/apt-get.cc
index d0330b08e,58976351c..96e974acb
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -60,7 -60,6 +60,7 @@@
  #include <errno.h>
  #include <regex.h>
  #include <sys/wait.h>
 +#include <sstream>
  									/*}}}*/
  
  using namespace std;
@@@ -629,6 -628,8 +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;
  
@@@ -640,12 -641,24 +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,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)
@@@ -996,7 -1009,7 +1010,7 @@@ bool InstallPackages(CacheFile &Cache,b
  	 cerr << _("Unable to correct missing packages.") << endl;
  	 return _error->Error(_("Aborting install."));
        }
 -       	 
 +
        _system->UnLock();
        int status_fd = _config->FindI("APT::Status-Fd",-1);
        pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd);
@@@ -1358,29 -1371,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)
@@@ -1392,60 -1396,12 +1406,60 @@@
     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;
  }
  									/*}}}*/
 +// DoAutomaticRemove - Remove all automatic unused packages		/*{{{*/
 +// ---------------------------------------------------------------------
 +/* Remove unused automatic packages */
 +bool DoAutomaticRemove(CacheFile &Cache)
 +{
 +   if(_config->FindI("Debug::pkgAutoRemove",false))
 +      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"));
 +
 +   {
 +     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)
 +	       Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false));
 +	     else
 +	       Cache->MarkKeep(Pkg, false, false);
 +	   }
 +       }
 +   }
 +
 +   // Now see if we destroyed anything
 +   if (Cache->BrokenCount() != 0)
 +   {
 +      c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n"
 +	         "shouldn't happen. Please file a bug report against apt.") << endl;
 +      c1out << endl;
 +      c1out << _("The following information may help to resolve the situation:") << endl;
 +      c1out << endl;
 +      ShowBroken(c1out,Cache,false);
 +
 +      return _error->Error(_("Internal Error, AutoRemover broke stuff"));
 +   }
 +   return true;
 +}
 +
  // DoUpgrade - Upgrade all packages					/*{{{*/
  // ---------------------------------------------------------------------
  /* Upgrade all packages without installing new packages or erasing old
@@@ -1488,168 -1444,155 +1502,168 @@@ bool DoInstall(CommandLine &CmdL
     bool DefRemove = false;
     if (strcasecmp(CmdL.FileList[0],"remove") == 0)
        DefRemove = true;
 +   else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0)
 +   {
 +      _config->Set("APT::Get::AutomaticRemove", "true");
 +      DefRemove = true;
 +   }
  
 -   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
 +   // new scope for the ActionGroup
     {
 -      // Duplicate the string
 -      unsigned int Length = strlen(*I);
 -      char S[300];
 -      if (Length >= sizeof(S))
 -	 continue;
 -      strcpy(S,*I);
 -      
 -      // See if we are removing and special indicators..
 -      bool Remove = DefRemove;
 -      char *VerTag = 0;
 -      bool VerIsRel = false;
 -      while (Cache->FindPkg(S).end() == true)
 +      pkgDepCache::ActionGroup group(Cache);
 +      for (const char **I = CmdL.FileList + 1; *I != 0; I++)
        {
 -	 // Handle an optional end tag indicating what to do
 -	 if (Length >= 1 && S[Length - 1] == '-')
 -	 {
 -	    Remove = true;
 -	    S[--Length] = 0;
 +	 // Duplicate the string
 +	 unsigned int Length = strlen(*I);
 +	 char S[300];
 +	 if (Length >= sizeof(S))
  	    continue;
 -	 }
 -	 
 -	 if (Length >= 1 && S[Length - 1] == '+')
 +	 strcpy(S,*I);
 +      
 +	 // See if we are removing and special indicators..
 +	 bool Remove = DefRemove;
 +	 char *VerTag = 0;
 +	 bool VerIsRel = false;
 +	 while (Cache->FindPkg(S).end() == true)
  	 {
 -	    Remove = false;
 -	    S[--Length] = 0;
 -	    continue;
 -	 }
 +	    // Handle an optional end tag indicating what to do
 +	    if (Length >= 1 && S[Length - 1] == '-')
 +	    {
 +	       Remove = true;
 +	       S[--Length] = 0;
 +	       continue;
 +	    }
  	 
 -	 char *Slash = strchr(S,'=');
 -	 if (Slash != 0)
 -	 {
 -	    VerIsRel = false;
 -	    *Slash = 0;
 -	    VerTag = Slash + 1;
 -	 }
 +	    if (Length >= 1 && S[Length - 1] == '+')
 +	    {
 +	       Remove = false;
 +	       S[--Length] = 0;
 +	       continue;
 +	    }
  	 
 -	 Slash = strchr(S,'/');
 -	 if (Slash != 0)
 -	 {
 -	    VerIsRel = true;
 -	    *Slash = 0;
 -	    VerTag = Slash + 1;
 -	 }
 +	    char *Slash = strchr(S,'=');
 +	    if (Slash != 0)
 +	    {
 +	       VerIsRel = false;
 +	       *Slash = 0;
 +	       VerTag = Slash + 1;
 +	    }
  	 
 -	 break;
 -      }
 +	    Slash = strchr(S,'/');
 +	    if (Slash != 0)
 +	    {
 +	       VerIsRel = true;
 +	       *Slash = 0;
 +	       VerTag = Slash + 1;
 +	    }
 +	 
 +	    break;
 +	 }
        
 -      // Locate the package
 -      pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
 -      Packages++;
 -      if (Pkg.end() == true)
 -      {
 -	 // Check if the name is a regex
 -	 const char *I;
 -	 for (I = S; *I != 0; I++)
 -	    if (*I == '?' || *I == '*' || *I == '|' ||
 -	        *I == '[' || *I == '^' || *I == '$')
 -	       break;
 -	 if (*I == 0)
 -	    return _error->Error(_("Couldn't find package %s"),S);
 +	 // Locate the package
 +	 pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
 +	 Packages++;
 +	 if (Pkg.end() == true)
 +	 {
 +	    // Check if the name is a regex
 +	    const char *I;
 +	    for (I = S; *I != 0; I++)
 +	       if (*I == '?' || *I == '*' || *I == '|' ||
 +		   *I == '[' || *I == '^' || *I == '$')
 +		  break;
 +	    if (*I == 0)
 +	       return _error->Error(_("Couldn't find package %s"),S);
  
 -	 // Regexs must always be confirmed
 -	 ExpectedInst += 1000;
 +	    // Regexs must always be confirmed
 +	    ExpectedInst += 1000;
  	 
 -	 // Compile the regex pattern
 -	 regex_t Pattern;
 -	 int Res;
 -	 if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
 -		     REG_NOSUB)) != 0)
 -	 {
 -	    char Error[300];	    
 -	    regerror(Res,&Pattern,Error,sizeof(Error));
 -	    return _error->Error(_("Regex compilation error - %s"),Error);
 -	 }
 +	    // Compile the regex pattern
 +	    regex_t Pattern;
 +	    int Res;
 +	    if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
 +			       REG_NOSUB)) != 0)
 +	    {
 +	       char Error[300];	    
 +	       regerror(Res,&Pattern,Error,sizeof(Error));
 +	       return _error->Error(_("Regex compilation error - %s"),Error);
 +	    }
  	 
 -	 // Run over the matches
 -	 bool Hit = false;
 -	 for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
 -	 {
 -	    if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
 -	       continue;
 +	    // Run over the matches
 +	    bool Hit = false;
 +	    for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
 +	    {
 +	       if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
 +		  continue;
  	    
 -	    ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
 -		     Pkg.Name(),S);
 +	       ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
 +			Pkg.Name(),S);
  	    
 +	       if (VerTag != 0)
 +		  if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
 +		     return false;
 +	    
 +	       Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
 +				   ExpectedInst,false);
 +	    }
 +	    regfree(&Pattern);
 +	 
 +	    if (Hit == false)
 +	       return _error->Error(_("Couldn't find package %s"),S);
 +	 }
 +	 else
 +	 {
  	    if (VerTag != 0)
  	       if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
  		  return false;
 -	    
 -	    Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
 -				ExpectedInst,false);
 -	 }
 -	 regfree(&Pattern);
 -	 
 -	 if (Hit == false)
 -	    return _error->Error(_("Couldn't find package %s"),S);
 -      }
 -      else
 -      {
 -	 if (VerTag != 0)
 -	    if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
 +	    if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
  	       return false;
 -	 if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
 -	    return false;
 -      }      
 -   }
 +	 }      
 +      }
  
 -   /* If we are in the Broken fixing mode we do not attempt to fix the
 -      problems. This is if the user invoked install without -f and gave
 -      packages */
 -   if (BrokenFix == true && Cache->BrokenCount() != 0)
 -   {
 -      c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
 -      ShowBroken(c1out,Cache,false);
 +      /* If we are in the Broken fixing mode we do not attempt to fix the
 +	 problems. This is if the user invoked install without -f and gave
 +	 packages */
 +      if (BrokenFix == true && Cache->BrokenCount() != 0)
 +      {
 +	 c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
 +	 ShowBroken(c1out,Cache,false);
  
 -      return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
 -   }
 +	 return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
 +      }
     
 -   // Call the scored problem resolver
 -   Fix.InstallProtect();
 -   if (Fix.Resolve(true) == false)
 -      _error->Discard();
 +      // Call the scored problem resolver
 +      Fix.InstallProtect();
 +      if (Fix.Resolve(true) == false)
 +	 _error->Discard();
  
 -   // Now we check the state of the packages,
 -   if (Cache->BrokenCount() != 0)
 -   {
 -      c1out << 
 -       _("Some packages could not be installed. This may mean that you have\n" 
 -	 "requested an impossible situation or if you are using the unstable\n" 
 -	 "distribution that some required packages have not yet been created\n"
 -	 "or been moved out of Incoming.") << endl;
 -      if (Packages == 1)
 +      // Now we check the state of the packages,
 +      if (Cache->BrokenCount() != 0)
        {
 -	 c1out << endl;
  	 c1out << 
 -	  _("Since you only requested a single operation it is extremely likely that\n"
 -	    "the package is simply not installable and a bug report against\n" 
 -	    "that package should be filed.") << endl;
 -      }
 +	    _("Some packages could not be installed. This may mean that you have\n" 
 +	      "requested an impossible situation or if you are using the unstable\n" 
 +	      "distribution that some required packages have not yet been created\n"
 +	      "or been moved out of Incoming.") << endl;
 +	 if (Packages == 1)
 +	 {
 +	    c1out << endl;
 +	    c1out << 
 +	       _("Since you only requested a single operation it is extremely likely that\n"
 +		 "the package is simply not installable and a bug report against\n" 
 +		 "that package should be filed.") << endl;
 +	 }
 +
 +	 c1out << _("The following information may help to resolve the situation:") << endl;
 +	 c1out << endl;
 +	 ShowBroken(c1out,Cache,false);
 +	 return _error->Error(_("Broken packages"));
 +      }   
 +   }
 +   if (_config->FindB("APT::Get::AutomaticRemove")) {
 +      if (!DoAutomaticRemove(Cache)) 
 +	 return false;
 +   }
  
 -      c1out << _("The following information may help to resolve the situation:") << endl;
 -      c1out << endl;
 -      ShowBroken(c1out,Cache,false);
 -      return _error->Error(_("Broken packages"));
 -   }   
 -   
     /* Print out a list of packages that are going to be installed extra
        to what the user asked */
     if (Cache->InstCount() != ExpectedInst)
@@@ -1669,8 -1612,8 +1683,8 @@@
  	 
  	 if (*J == 0) {
  	    List += string(I.Name()) + " ";
 -        VersionsList += string(Cache[I].CandVersion) + "\n";
 -     }
 +	    VersionsList += string(Cache[I].CandVersion) + "\n";
 +	 }
        }
        
        ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
@@@ -1805,8 -1748,6 +1819,8 @@@ bool DoDSelectUpgrade(CommandLine &CmdL
     if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
        return false;
     
 +   pkgDepCache::ActionGroup group(Cache);
 +
     // Install everything with the install flag set
     pkgCache::PkgIterator I = Cache->PkgBegin();
     for (;I.end() != true; I++)
@@@ -2559,7 -2500,6 +2573,7 @@@ void GetInitialize(
     _config->Set("APT::Get::Fix-Broken",false);
     _config->Set("APT::Get::Force-Yes",false);
     _config->Set("APT::Get::List-Cleanup",true);
 +   _config->Set("APT::Get::AutomaticRemove",false);
  }
  									/*}}}*/
  // SigWinch - Window size change signal handler				/*{{{*/
@@@ -2615,9 -2555,9 +2629,10 @@@ int main(int argc,const char *argv[]
        {0,"remove","APT::Get::Remove",0},
        {0,"only-source","APT::Get::Only-Source",0},
        {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}};
@@@ -2625,7 -2565,6 +2640,7 @@@
                                     {"upgrade",&DoUpgrade},
                                     {"install",&DoInstall},
                                     {"remove",&DoInstall},
 +				   {"autoremove",&DoInstall},
                                     {"dist-upgrade",&DoDistUpgrade},
                                     {"dselect-upgrade",&DoDSelectUpgrade},
  				   {"build-dep",&DoBuildDep},
diff --combined configure.in
index 5c573e72b,f0b0d6703..aa9abc1e6
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --combined debian/changelog
index b26aad6c0,65ec82cc1..946971906
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,11 +1,14 @@@
 -apt (0.6.45.2) unstable; urgency=low
++apt (0.6.45ubuntu3) edgy; urgency=low
+ 
 -  * added "--install-recommends" to handle recommends as 
 -    dependencies (closes: #42266)
++  * ABI break
++  * merged latest apt--install-recommends
++  * added "--fix-policy" option to can be used as "--fix-broken" and
++    will install missing weak depends (recommends, and/or suggests 
++    depending on the settings)
+ 
+  --
+ 
 -apt (0.6.45.1) unstable; urgency=low
 +apt (0.6.45ubuntu2) edgy; urgency=low
  
    * debian/control:
      - switched to libdb4.4 for building (closes: #381019)
@@@ -7,18 -14,8 +17,18 @@@
        versions of the package (closes: #257054)
      - properly handle recommends/suggests or-groups when printing the list of
        suggested/recommends packages (closes: #311619)
 +  * merged "apt--install-recommends" branch:
 +    - added "{no-}install-recommends" commandline option
 +    - added APT::Install-{Recommends,Suggests} option
 +    - currently Install-Recommends defaults to "False" 
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 14:27:54 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 23:38:46 +0200
 +
 +apt (0.6.45ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  1 Aug 2006 15:43:22 +0200
  
  apt (0.6.45) unstable; urgency=low
  
@@@ -59,38 -56,7 +69,38 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
  
 -apt  (0.6.44.2) unstable; urgency=low 
 +apt (0.6.44.2ubuntu4) edgy; urgency=low
 +
 +  * Make apt-get dselect-upgrade happy again
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Jul 2006 11:03:02 +0200
 +
 +apt (0.6.44.2ubuntu3) edgy; urgency=low
 +
 +  * Close extended_states file after writing it.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Tue, 18 Jul 2006 00:12:13 +0100
 +
 +apt (0.6.44.2ubuntu2) edgy; urgency=low
 +
 +  * create a empty extended_states file if none exists already
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 09:23:03 +0200
 +
 +apt (0.6.44.2ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +  * merged the "auto-mark" branch to support aptitude like
 +    marking of automatically installed dependencies and added
 +    "apt-get remove --auto-remove" to remove unused auto-installed
 +    packages again
 +  * changed library version from 3.11 to 3.50 to make it clearly 
 +    different from the debian version (we are ABI incompatible because
 +    of the auto-mark patch)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 +
 +apt  (0.6.44.2) unstable; urgency=low
    
     * apt-pkg/depcache.cc:
       - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
@@@ -158,26 -124,6 +168,26 @@@ apt (0.6.44) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:28:53 +0200
  
 +apt (0.6.43.3ubuntu3) dapper; urgency=low
 +
 +  * methods/http.cc:
 +    - fix the user-agent string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 May 2006 18:09:32 +0200
 +
 +apt (0.6.43.3ubuntu2) dapper; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Apr 2006 13:24:40 +0200
 +
 +apt (0.6.43.3ubuntu1) dapper; urgency=low
 +
 +  * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in 
 +    the status-fd (ubuntu #28954)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 20:34:46 +0200
 +
  apt (0.6.43.3) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@@ -187,46 -133,16 +197,46 @@@
      * pl.po: Completed to 512t. Closes: #349514
      * sk.po: Completed to 512t. Closes: #349474
      * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
      * sv.po: Completed to 512 strings Closes: #349210
      * ru.po: Completed to 512 strings Closes: #349154
      * da.po: Completed to 512 strings Closes: #349084
      * fr.po: Completed to 512 strings
 +    * LINGUAS: Add Welsh
 +    * *.po: Updated from sources (512 strings)
      * vi.po: Completed to 511 strings  Closes: #348968
 -    * zh_CN.po: Completed to 512t. Closes: #353936
 -    * it.po: Completed to 512t. Closes: #352803
 -    * pt_BR.po: Completed to 512t. Closes: #352419
 +  * apt-pkg/deb/deblistparser.cc:
 +    - don't explode on a DepCompareOp in a Provides line, but warn about
 +      it and ignore it otherwise (thanks to James Troup for reporting it)
 +  * cmdline/apt-get.cc:
 +    - don't lock the lists directory in DoInstall, breaks --print-uri 
 +      (thanks to James Troup for reporting it)
 +  * debian/apt.dirs: create /etc/apt/sources.list.d 
 +  * make apt-cache madison work without deb-src entries (#352583)
 +  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
 +    successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
 +
 + --  Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 +
 +apt (0.6.43.2ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
 +  * ca.po: Completed to 512t. Closes: #351592
 +    * eu.po: Completed to 512t. Closes: #350483
 +    * ja.po: Completed to 512t. Closes: #349806
 +    * pl.po: Completed to 512t. Closes: #349514
 +    * sk.po: Completed to 512t. Closes: #349474
 +    * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
 +    * sv.po: Completed to 512 strings Closes: #349210
 +    * ru.po: Completed to 512 strings Closes: #349154
 +    * da.po: Completed to 512 strings Closes: #349084
 +    * fr.po: Completed to 512 strings
      * LINGUAS: Add Welsh
      * *.po: Updated from sources (512 strings)
 +    * vi.po: Completed to 511 strings  Closes: #348968
    * apt-pkg/deb/deblistparser.cc:
      - don't explode on a DepCompareOp in a Provides line, but warn about
        it and ignore it otherwise (thanks to James Troup for reporting it)
@@@ -237,10 -153,8 +247,10 @@@
    * make apt-cache madison work without deb-src entries (#352583)
    * cmdline/apt-get.cc: only run the list-cleaner if a update was 
      successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
  
 - -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
  
  apt (0.6.43.2) unstable; urgency=low
  
@@@ -265,26 -179,8 +275,26 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
 -apt (0.6.43.1) unstable; urgency=low
 +apt (0.6.43.1ubuntu1) dapper; urgency=low
  
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
 +    - en_GB.po, de.po: fix spaces errors in "Ign " translations
 +      Closes: #347258
 +    - makefile: make update-po a pre-requisite of clean target so
 +	        that POT and PO files are always up-to-date
 +    - sv.po: Completed to 511t. Closes: #346450
 +    - sk.po: Completed to 511t. Closes: #346369
 +    - fr.po: Completed to 511t
 +    - *.po: Updated from sources (511 strings)
 +  * add patch to fix http download corruption problem (thanks to
 +    Petr Vandrovec, closes: #280844, #290694)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
 +
 +apt (0.6.43.1) unstable; urgency=low
 +  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
      * fr.po: Completed to 510 strings
      * it.po: Completed to 510t
@@@ -306,19 -202,6 +316,19 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri,  6 Jan 2006 01:17:08 +0100
  
 +apt (0.6.43ubuntu2) dapper; urgency=low
 +
 +  * merged some missing bits that wheren't merged by baz in the previous
 +    upload (*grumble*)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  8 Dec 2005 18:35:58 +0100
 +
 +apt (0.6.43ubuntu1) dapper; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
 +
  apt (0.6.43) unstable; urgency=medium
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
@@@ -339,22 -222,6 +349,22 @@@
    
   -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
  
 +apt (0.6.42.3ubuntu2) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:  
 +    * zh_CN.po: Completed to 507 strings(Closes: #338267)
 +    * gl.po: Completed to 510 strings (Closes: #338356)
 +  * added support for "/etc/apt/sources.list.d" directory 
 +    (closes: #66325)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Nov 2005 15:30:12 +0100
 +
 +apt (0.6.42.3ubuntu1) dapper; urgency=low
 +
 +  * synced with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
 +
  apt (0.6.42.3) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@@ -402,13 -269,13 +412,13 @@@ apt (0.6.42) unstable; urgency=lo
      - unmount the cdrom when apt failed to locate any package files
    * allow cdrom failures and fallback to other sources in that case
      (closes: #44135)
 -  * better error text when dpkg-source fails 
 +  * better error text when dpkg-source fails
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
      - patch-99: Added Galician translation
      - patch-100: Completed Danish translation (Closes: #325686)
      - patch-104: French translation completed
      - patch-109: Italian translation completed
 -    - patch-112: Swedish translation update 
 +    - patch-112: Swedish translation update
      - patch-115: Basque translation completed (Closes: #333299)
    * applied french man-page update (thanks to Philippe Batailler)
      (closes: #316638, #327456)
@@@ -422,12 -289,12 +432,12 @@@
    * apt-pkg/contrib/md5.cc:
      - fix a alignment problem on sparc64 that gives random bus errors
        (thanks to Fabbione for providing a test-case)
 -  * init the default ScreenWidth to 79 columns by default 
 +  * init the default ScreenWidth to 79 columns by default
      (Closes: #324921)
 -  * cmdline/apt-cdrom.cc: 
 +  * cmdline/apt-cdrom.cc:
      - fix some missing gettext() calls (closes: #334539)
    * doc/apt-cache.8.xml: fix typo (closes: #334714)
 -  
 +
   -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
  
  apt (0.6.41) unstable; urgency=low
@@@ -435,8 -302,8 +445,8 @@@
    * improved the support for "error" and "conffile" reporting from
      dpkg, added the format to README.progress-reporting
    * added README.progress-reporting to the apt-doc package
 -  * improved the network timeout handling, if a index file from a 
 -    sources.list times out or EAI_AGAIN is returned from getaddrinfo, 
 +  * improved the network timeout handling, if a index file from a
 +    sources.list times out or EAI_AGAIN is returned from getaddrinfo,
      don't try to get the other files from that entry
    * Support architecture-specific extra overrides
      (closes: #225947). Thanks to  Anthony Towns for idea and
@@@ -444,10 -311,10 +454,10 @@@
    * Javier Fernandez-Sanguino Pen~a:
      - Added a first version of an apt-secure.8 manpage, and modified
        apt-key and apt.end accordingly. Also added the 'update'
 -      argument to apt-key which was previously not documented 
 +      argument to apt-key which was previously not documented
        (Closes: #322120)
    * Andreas Pakulat:
 -    - added example apt-ftparchive.conf file to doc/examples 
 +    - added example apt-ftparchive.conf file to doc/examples
        (closes: #322483)
    * Fix a incorrect example in the man-page (closes: #282918)
    * Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@@ -456,84 -323,10 +466,84 @@@
    * Change pkgPolicy::Pin from private to protected to let subclasses
      access it too (closes: #321799)
    * add default constructor for PrvIterator (closes: #322267)
 -  * Reread status configuration on debSystem::Initialize() 
 +  * Reread status configuration on debSystem::Initialize()
      (needed for apt-proxy, thanks to Otavio for this patch)
 -  
 +
   -- Michael Vogt <mvo@debian.org>  Mon,  5 Sep 2005 22:59:03 +0200
 +  
 +apt (0.6.40.1ubuntu8) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
 +    - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
 +  * po/de.po, po/fr.po: 
 +    - updated the translations
 +  * po/makefile:
 +    - create a single pot file in each domain dir to make rosetta happy
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 +
 +apt (0.6.40.1ubuntu7) breezy; urgency=low
 +
 +  * updated the pot/po files , no code changes
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Sep 2005 18:38:16 +0200
 +
 +apt (0.6.40.1ubuntu6) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
 +    - make it possible for apt to handle a failed MediaChange event and
 +      fall back to other sources (ubuntu #13713)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2005 22:09:50 +0200
 +
 +apt (0.6.40.1ubuntu5) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
 +    This adds media-change reporting to the apt status-fd (ubuntu #15213)
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
 +    apt-pkg/cdrom.cc:
 +    - unmount the cdrom when apt failed to locate any package files
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 15:44:26 +0200
 +
 +apt (0.6.40.1ubuntu4) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - fix a embarrassing typo
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 10:10:37 +0200
 +
 +apt (0.6.40.1ubuntu3) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use the ctime as well when figuring what packages need to
 +      be removed. This fixes the problem that packages copied with    
 +      "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Sep 2005 18:30:46 +0200
 +
 +apt (0.6.40.1ubuntu2) breezy; urgency=low
 +
 +  * improved the support for "error" and "conffile" reporting from
 +    dpkg, added the format to README.progress-reporting
 +  * added README.progress-reporting to the apt-doc package
 +  * Do md5sum checking for file and cdrom method (closes: #319142)
 +  * Change pkgPolicy::Pin from private to protected to let subclasses
 +    access it too (closes: #321799)
 +  * methods/connect.cc:
 +    - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
 +  * apt-pkg/acquire-item.cc:
 +    - fail early if a FailReason is TmpResolveFailure (avoids hangs during
 +      the install when no network is available)
 +  * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 19:44:55 +0200
 +
 +apt (0.6.40.1ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 14:20:56 +0200
  
  apt (0.6.40.1) unstable; urgency=low
  
@@@ -544,12 -337,6 +554,12 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 13:24:58 +0200
  
 +apt (0.6.40ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Thu,  4 Aug 2005 15:53:22 -0700
 +
  apt (0.6.40) unstable; urgency=low
  
    * Patch from Jordi Mallach to mark some additional strings for translation
@@@ -565,39 -352,6 +575,39 @@@
  
   -- Matt Zimmerman <mdz@debian.org>  Thu, 28 Jul 2005 11:57:32 -0700
  
 +apt (0.6.39ubuntu4) breezy; urgency=low
 +
 +  * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
 +    before...)
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 29 Jun 2005 08:39:17 -0700
 +
 +apt (0.6.39ubuntu3) breezy; urgency=low
 +
 +  * Fix keyring locations for Ubuntu in apt-key too.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 14:45:36 +0100
 +
 +apt (0.6.39ubuntu2) breezy; urgency=low
 +
 +  * Install ubuntu-archive.gpg rather than debian-archive.gpg as
 +    /etc/apt/trusted.gpg.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 11:53:34 +0100
 +
 +apt (0.6.39ubuntu1) breezy; urgency=low
 +
 +  * Michael Vogt
 +    - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
 +    - Fix a incorrect example in the man-page (closes: #282918)
 +    - Support architecture-specific extra overrides
 +      (closes: #225947). Thanks to  Anthony Towns for idea and
 +      the patch, thanks to Colin Watson for testing it.
 +    - better report network timeouts from the methods to the acuire code,
 +      only timeout once per sources.list line
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 28 Jun 2005 11:52:24 -0700
 +
  apt (0.6.39) unstable; urgency=low
  
    * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@@ -608,14 -362,7 +618,14 @@@
    * Update priority of apt-utils to important, to match the override file
    * Install only one keyring on each branch (Closes: #316119)
  
 - -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -0700
 + -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:35:21 -0700
 +
 +apt (0.6.38ubuntu1) breezy; urgency=low
 +
 +  * First release from Ubuntu branch
 +  * Merge with --main--0, switch back to Ubuntu keyring
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 25 Jun 2005 16:52:41 -0700
  
  apt (0.6.38) unstable; urgency=low
  
@@@ -647,7 -394,6 +657,7 @@@ apt (0.6.37) breezy; urgency=lo
    * Add Welsh translation from Dafydd Harries
      (daf@muse.19inch.net--2005/apt--main--0--patch-1)
    * Change debian/bugscript to use #!/bin/bash (Closes: #313402)
 +  * Fix a incorrect example in the man-page (closes: #282918)
  
   -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 24 May 2005 14:38:25 -0700
  
diff --combined methods/makefile
index 03a424411,1e3b1ef85..2e3abe55c
--- a/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
- LIB_APT_PKG_MAJOR = 3.50
 -LIB_APT_PKG_MAJOR = 3.11
++LIB_APT_PKG_MAJOR = 3.51
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method