merged from debian-sid

diff --combined apt-pkg/deb/dpkgpm.cc
index a3a7ae5b316272080f340429b842f33e1648587d,5fbd1801a4de8b34ef0a7b3483694437dbca67f1..f8758ea0a50b162f15ff509351ed84c6db602541
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -14,8 -14,8 +14,8 @@@
  #include <apt-pkg/depcache.h>
  #include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/strutl.h>
- #include <apti18n.h>
  #include <apt-pkg/fileutl.h>
+ #include <apt-pkg/cachefile.h>
  
  #include <unistd.h>
  #include <stdlib.h>
@@@ -32,6 -32,8 +32,8 @@@
  #include <algorithm>
  #include <sstream>
  #include <map>
+ #include <pwd.h>
+ #include <grp.h>
  
  #include <termios.h>
  #include <unistd.h>
@@@ -391,8 -393,9 +393,9 @@@ void pkgDPkgPM::DoTerminalPty(int maste
     {
        // this happens when the child is about to exit, we
        // give it time to actually exit, otherwise we run
-       // into a race
-       usleep(500000);
+       // into a race so we sleep for half a second.
+       struct timespec sleepfor = { 0, 500000000 };
+       nanosleep(&sleepfor, NULL);
        return;
     }  
     if(len <= 0) 
@@@ -666,7 -669,13 +669,13 @@@ bool pkgDPkgPM::OpenLog(
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
        setvbuf(term_out, NULL, _IONBF, 0);
        SetCloseExec(fileno(term_out), true);
-       chmod(logfile_name.c_str(), 0600);
+       struct passwd *pw;
+       struct group *gr;
+       pw = getpwnam("root");
+       gr = getgrnam("adm");
+       if (pw != NULL && gr != NULL)
+         chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid);
+       chmod(logfile_name.c_str(), 0644);
        fprintf(term_out, "\nLog started: %s\n", timestr);
     }
  
@@@ -680,31 -689,42 +689,42 @@@
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
        chmod(history_name.c_str(), 0644);
        fprintf(history_out, "\nStart-Date: %s\n", timestr);
-       string remove, purge, install, upgrade, downgrade;
+       string remove, purge, install, reinstall, upgrade, downgrade;
        for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
        {
-        if (Cache[I].NewInstall())
-        {
-           install += I.FullName(false) + string(" (") + Cache[I].CandVersion;
-           if (Cache[I].Flags & pkgCache::Flag::Auto)
-              install+= ", automatic";
-           install += string("), ");
-        }
-        else if (Cache[I].Upgrade())
-           upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
-        else if (Cache[I].Downgrade())
-           downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
-        else if (Cache[I].Delete())
-        {
-           if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
-              purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");     
-           else
-              remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");            
+        enum { CANDIDATE, CANDIDATE_AUTO, CURRENT_CANDIDATE, CURRENT } infostring;
+        string *line = NULL;
+        #define HISTORYINFO(X, Y) { line = &X; infostring = Y; }
+        if (Cache[I].NewInstall() == true)
+           HISTORYINFO(install, CANDIDATE_AUTO)
+        else if (Cache[I].ReInstall() == true)
+           HISTORYINFO(reinstall, CANDIDATE)
+        else if (Cache[I].Upgrade() == true)
+           HISTORYINFO(upgrade, CURRENT_CANDIDATE)
+        else if (Cache[I].Downgrade() == true)
+           HISTORYINFO(downgrade, CURRENT_CANDIDATE)
+        else if (Cache[I].Delete() == true)
+           HISTORYINFO((Cache[I].Purge() ? purge : remove), CURRENT)
+        else
+           continue;
+        #undef HISTORYINFO
+        line->append(I.FullName(false)).append(" (");
+        switch (infostring) {
+        case CANDIDATE: line->append(Cache[I].CandVersion); break;
+        case CANDIDATE_AUTO:
+           line->append(Cache[I].CandVersion);
+           if ((Cache[I].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
+              line->append(", automatic");
+           break;
+        case CURRENT_CANDIDATE: line->append(Cache[I].CurVersion).append(", ").append(Cache[I].CandVersion); break;
+        case CURRENT: line->append(Cache[I].CurVersion); break;
         }
+        line->append("), ");
        }
        if (_config->Exists("Commandline::AsString") == true)
         WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
        WriteHistoryTag("Install", install);
+       WriteHistoryTag("Reinstall", reinstall);
        WriteHistoryTag("Upgrade", upgrade);
        WriteHistoryTag("Downgrade",downgrade);
        WriteHistoryTag("Remove",remove);
@@@ -1268,6 -1288,23 +1288,23 @@@ bool pkgDPkgPM::Go(int OutStatusFd
     if (RunScripts("DPkg::Post-Invoke") == false)
        return false;
  
+    if (_config->FindB("Debug::pkgDPkgPM",false) == false)
+    {
+       std::string const oldpkgcache = _config->FindFile("Dir::cache::pkgcache");
+       if (oldpkgcache.empty() == false && RealFileExists(oldpkgcache) == true &&
+         unlink(oldpkgcache.c_str()) == 0)
+       {
+        std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
+        if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
+        {
+           _error->PushToStack();
+           pkgCacheFile CacheFile;
+           CacheFile.BuildCaches(NULL, true);
+           _error->RevertToStack();
+        }
+       }
+    }
+ 
     Cache.writeStateFile(NULL);
     return true;
  }
@@@ -1289,7 -1326,7 +1326,7 @@@ void pkgDPkgPM::WriteApportReport(cons
     string::size_type pos;
     FILE *report;
  
 -   if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
 +   if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
     {
        std::clog << "configured to not write apport reports" << std::endl;
        return;
@@@ -1316,43 -1353,18 +1353,43 @@@
     }
  
     // do not report out-of-memory failures 
 -   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
 +   if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
 +      strstr(errormsg, "failed to allocate memory") != NULL) {
        std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
        return;
     }
  
 -   // do not report dpkg I/O errors
 -   // XXX - this message is localized, but this only matches the English version.  This is better than nothing.
 -   if(strstr(errormsg, "short read in buffer_copy (")) {
 -      std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +   // do not report bugs regarding inaccessible local files
 +   if(strstr(errormsg, strerror(ENOENT)) != NULL ||
 +      strstr(errormsg, "cannot access archive") != NULL) {
 +      std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
        return;
     }
  
 +   // do not report dpkg I/O errors, this is a format string, so we compare
 +   // the prefix and the suffix of the error with the dpkg error message
 +   vector<string> io_errors;
 +   io_errors.push_back(string("failed to read on buffer copy for %s"));
 +   io_errors.push_back(string("failed in write on buffer copy for %s"));
 +   io_errors.push_back(string("short read on buffer copy for %s"));
 +
 +   for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++)
 +   {
 +      vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%');
 +      if (list.size() > 1) {
 +         // we need to split %s, VectorizeString only allows char so we need
 +         // to kill the "s" manually
 +         if (list[1].size() > 1) {
 +            list[1].erase(0, 1);
 +            if(strstr(errormsg, list[0].c_str()) && 
 +               strstr(errormsg, list[1].c_str())) {
 +               std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +               return;
 +            }
 +         }
 +      }
 +   }
 +
     // get the pkgname and reportfile
     pkgname = flNotDir(pkgpath);
     pos = pkgname.find('_');
@@@ -1439,24 -1451,6 +1476,24 @@@
        fprintf(report, "DpkgTerminalLog:\n");
        log = fopen(logfile_name.c_str(),"r");
        if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +         fprintf(report, " \n");
 +       fclose(log);
 +      }
 +   }
 +
 +   // attach history log it if we have it
 +   string histfile_name = _config->FindFile("Dir::Log::History");
 +   if (!histfile_name.empty())
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "DpkgHistoryLog:\n");
 +      log = fopen(histfile_name.c_str(),"r");
 +      if(log != NULL)
        {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);

diff --combined apt-pkg/depcache.cc
index 09a2cac2dbe448e4823e7ac8f50e0122d875d10d,e9fa097aaf11e8aa32fdfc274059daf46c9a9eea..5487bc5c52ab00652c2382884b66e79fefb0f9c2
--- 1/apt-pkg/depcache.cc
--- 2/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -339,8 -339,7 +339,7 @@@ bool pkgDepCache::CheckDep(DepIterator 
     /* Check simple depends. A depends -should- never self match but 
        we allow it anyhow because dpkg does. Technically it is a packaging
        bug. Conflicts may never self match */
-    if (Dep.TargetPkg() != Dep.ParentPkg() ||
-        (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes))
+    if (Dep.TargetPkg() != Dep.ParentPkg() || Dep.IsNegative() == false)
     {
        PkgIterator Pkg = Dep.TargetPkg();
        // Check the base package
@@@ -370,8 -369,7 +369,7 @@@
     {
        /* Provides may never be applied against the same package (or group)
           if it is a conflicts. See the comment above. */
-       if (P.OwnerPkg()->Group == Pkg->Group &&
-         (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks))
+       if (P.OwnerPkg()->Group == Pkg->Group && Dep.IsNegative() == true)
         continue;
        
        // Check if the provides is a hit
@@@ -549,7 -547,7 +547,7 @@@ void pkgDepCache::AddStates(const PkgIt
     // Not installed
     if (Pkg->CurrentVer == 0)
     {
-       if (State.Mode == ModeDelete && 
+       if (State.Mode == ModeDelete &&
          (State.iFlags & Purge) == Purge && Pkg.Purge() == false)
         iDelCount += Add;
        
@@@ -594,9 -592,7 +592,7 @@@ void pkgDepCache::BuildGroupOrs(VerIter
  
        /* Invert for Conflicts. We have to do this twice to get the
           right sense for a conflicts group */
-       if (D->Type == Dep::Conflicts ||
-         D->Type == Dep::DpkgBreaks ||
-         D->Type == Dep::Obsoletes)
+       if (D.IsNegative() == true)
         State = ~State;
        
        // Add to the group if we are within an or..
@@@ -607,9 -603,7 +603,7 @@@
         Group = 0;
        
        // Invert for Conflicts
-       if (D->Type == Dep::Conflicts ||
-         D->Type == Dep::DpkgBreaks ||
-         D->Type == Dep::Obsoletes)
+       if (D.IsNegative() == true)
         State = ~State;
     }   
  }
@@@ -742,9 -736,7 +736,7 @@@ void pkgDepCache::Update(OpProgress *Pr
               Group = 0;
  
            // Invert for Conflicts
-           if (D->Type == Dep::Conflicts ||
-               D->Type == Dep::DpkgBreaks ||
-               D->Type == Dep::Obsoletes)
+           if (D.IsNegative() == true)
               State = ~State;
         }
        }
@@@ -774,9 -766,7 +766,7 @@@ void pkgDepCache::Update(DepIterator D
        State = DependencyState(D);
      
        // Invert for Conflicts
-       if (D->Type == Dep::Conflicts ||
-         D->Type == Dep::DpkgBreaks ||
-         D->Type == Dep::Obsoletes)
+       if (D.IsNegative() == true)
         State = ~State;
  
        RemoveStates(D.ParentPkg());
@@@ -927,7 -917,6 +917,7 @@@ bool pkgDepCache::IsDeleteOk(PkgIterato
     if (FromUser == false && Pkg->CurrentVer == 0)
     {
        StateCache &P = PkgState[Pkg->ID];
 +      // Status == 2 means this applies for new installs only
        if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
        {
         if (DebugMarker == true)
@@@ -1089,7 -1078,22 +1079,22 @@@ void pkgDepCache::MarkInstall(PkgIterat
        */
        if (IsImportantDep(Start) == false)
         continue;
-       
+ 
+       /* If we are in an or group locate the first or that can 
+          succeed. We have already cached this.. */
+       for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; --Ors)
+        ++Start;
+       if (Ors == 1 && (DepState[Start->ID] &DepCVer) != DepCVer && Start.IsNegative() == false)
+       {
+        if(DebugAutoInstall == true)
+           std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl;
+        if (Start.IsCritical() == false)
+           continue;
+        // if the dependency was critical, we can't install it, so remove it again
+        MarkDelete(Pkg,false,Depth + 1, false);
+        return;
+       }
+ 
        /* Check if any ImportantDep() (but not Critical) were added
         * since we installed the package.  Also check for deps that
         * were satisfied in the past: for instance, if a version
@@@ -1097,57 -1101,49 +1102,49 @@@
         * package should follow that Recommends rather than causing the
         * dependency to be removed. (bug #470115)
         */
-       bool isNewImportantDep = false;
-       bool isPreviouslySatisfiedImportantDep = false;
-       if(!ForceImportantDeps && !Start.IsCritical())
+       if (Pkg->CurrentVer != 0 && ForceImportantDeps == false && Start.IsCritical() == false)
        {
-        bool found=false;
-        VerIterator instVer = Pkg.CurrentVer();
-        if(!instVer.end())
+        bool isNewImportantDep = true;
+        bool isPreviouslySatisfiedImportantDep = false;
+        for (DepIterator D = Pkg.CurrentVer().DependsList(); D.end() != true; ++D)
         {
-          for (DepIterator D = instVer.DependsList(); D.end() != true; D++)
-            {
-              //FIXME: deal better with or-groups(?)
-              if(IsImportantDep(D) && !D.IsCritical() &&
-                 Start.TargetPkg() == D.TargetPkg())
-                {
-                  if(!isPreviouslySatisfiedImportantDep)
-                    {
-                      DepIterator D2 = D;
-                      while((D2->CompareOp & Dep::Or) != 0)
-                        ++D2;
- 
-                      isPreviouslySatisfiedImportantDep =
-                        (((*this)[D2] & DepGNow) != 0);
-                    }
- 
-                  found=true;
-                }
-            }
-           // this is a new dep if it was not found to be already
-           // a important dep of the installed pacakge
-           isNewImportantDep = !found;
+           //FIXME: Should we handle or-group better here?
+           // We do not check if the package we look for is part of the same or-group
+           // we might find while searching, but could that really be a problem?
+           if (D.IsCritical() == true || IsImportantDep(D) == false ||
+               Start.TargetPkg() != D.TargetPkg())
+              continue;
+ 
+           isNewImportantDep = false;
+ 
+           while ((D->CompareOp & Dep::Or) != 0)
+              ++D;
+ 
+           isPreviouslySatisfiedImportantDep = (((*this)[D] & DepGNow) != 0);
+           if (isPreviouslySatisfiedImportantDep == true)
+              break;
+        }
+ 
+        if(isNewImportantDep == true)
+        {
+           if (DebugAutoInstall == true)
+              std::clog << OutputInDepth(Depth) << "new important dependency: "
+                        << Start.TargetPkg().FullName() << std::endl;
+        }
+        else if(isPreviouslySatisfiedImportantDep == true)
+        {
+           if (DebugAutoInstall == true)
+              std::clog << OutputInDepth(Depth) << "previously satisfied important dependency on "
+                        << Start.TargetPkg().FullName() << std::endl;
+        }
+        else
+        {
+           if (DebugAutoInstall == true)
+              std::clog << OutputInDepth(Depth) << "ignore old unsatisfied important dependency on "
+                        << Start.TargetPkg().FullName() << std::endl;
+           continue;
         }
        }
-       if(isNewImportantDep)
-        if(DebugAutoInstall == true)
-           std::clog << OutputInDepth(Depth) << "new important dependency: "
-                     << Start.TargetPkg().Name() << std::endl;
-       if(isPreviouslySatisfiedImportantDep)
-       if(DebugAutoInstall == true)
-         std::clog << OutputInDepth(Depth) << "previously satisfied important dependency on "
-                   << Start.TargetPkg().Name() << std::endl;
- 
-       // skip important deps if the package is already installed
-       if (Pkg->CurrentVer != 0 && Start.IsCritical() == false 
-         && !isNewImportantDep && !isPreviouslySatisfiedImportantDep
-         && !ForceImportantDeps)
-        continue;
-       
-       /* If we are in an or group locate the first or that can 
-          succeed. We have already cached this.. */
-       for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; Ors--)
-        Start++;
  
        /* This bit is for processing the possibilty of an install/upgrade
           fixing the problem */
@@@ -1213,8 -1209,7 +1210,7 @@@
        /* For conflicts we just de-install the package and mark as auto,
           Conflicts may not have or groups.  For dpkg's Breaks we try to
           upgrade the package. */
-       if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes ||
-         Start->Type == Dep::DpkgBreaks)
+       if (Start.IsNegative() == true)
        {
         for (Version **I = List; *I != 0; I++)
         {

diff --combined apt-pkg/init.cc
index 0354e6e4d3603ac37dbfd6e0bd6a032349909b6b,31b2d9ccd163f7606797da2bf8669049fa440ed8..c9f954d2d19c5ae2f309423afe3d4d18a191df7d
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -84,13 -84,7 +84,10 @@@ bool pkgInitConfig(Configuration &Cnf
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
 +   // ubuntu specific
 +   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
 +   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
  
-    // Translation
-    Cnf.Set("APT::Acquire::Translation", "environment");
- 
     // Default cdrom mount point
     Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
  

diff --combined cmdline/apt-get.cc
index 3821b5d4cecfafd2baf5b45d5885a12823559916,845c92026b66602e3f9799e0b634451d23f823f8..cb2ec0a2b2b5e14b4abb0fe1a705204f61954b80
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -2050,8 -2050,8 +2050,8 @@@ bool DoInstall(CommandLine &CmdL
  
     return InstallPackages(Cache,false);   
  }
- 
- /* mark packages as automatically/manually installed. */
+                                                                       /*}}}*/
+ /* mark packages as automatically/manually installed.                 {{{*/
  bool DoMarkAuto(CommandLine &CmdL)
  {
     bool Action = true;
@@@ -2086,6 -2086,9 +2086,9 @@@
           AutoMarkChanged++;
        }
     }
+ 
+    _error->Notice(_("This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' instead."));
+ 
     if (AutoMarkChanged && ! _config->FindB("APT::Get::Simulate",false))
        return Cache->writeStateFile(NULL);
     return false;
@@@ -2386,8 -2389,10 +2389,10 @@@ bool DoSource(CommandLine &CmdL
        string Src;
        pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,*Cache);
        
-       if (Last == 0)
+       if (Last == 0) {
+        delete[] Dsc;
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
+       }
        
        string srec = Last->AsStr();
        string::size_type pos = srec.find("\nVcs-");
@@@ -2418,8 -2423,10 +2423,10 @@@
  
        // Back track
        vector<pkgSrcRecords::File> Lst;
-       if (Last->Files(Lst) == false)
+       if (Last->Files(Lst) == false) {
+        delete[] Dsc;
         return false;
+       }
  
        // Load them into the fetcher
        for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
@@@ -2480,6 -2487,7 +2487,7 @@@
     struct statvfs Buf;
     string OutputDir = ".";
     if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+       delete[] Dsc;
        if (errno == EOVERFLOW)
         return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
                                OutputDir.c_str());
@@@ -2493,10 -2501,12 +2501,12 @@@
  #if HAVE_STRUCT_STATFS_F_TYPE
             || unsigned(Stat.f_type) != RAMFS_MAGIC
  #endif
-            ) 
+            )  {
+        delete[] Dsc;
            return _error->Error(_("You don't have enough free space in %s"),
                OutputDir.c_str());
-       }
+        }
+      }
     
     // Number of bytes
     if (DebBytes != FetchBytes)
@@@ -2531,7 -2541,10 +2541,10 @@@
     
     // Run it
     if (Fetcher.Run() == pkgAcquire::Failed)
+    {
+       delete[] Dsc;
        return false;
+    }
  
     // Print error messages
     bool Failed = false;
@@@ -2546,8 -2559,11 +2559,11 @@@
        Failed = true;
     }
     if (Failed == true)
+    {
+       delete[] Dsc;
        return _error->Error(_("Failed to fetch some archives."));
-    
+    }
+ 
     if (_config->FindB("APT::Get::Download-only",false) == true)
     {
        c1out << _("Download complete and in download only mode") << endl;
@@@ -2999,10 -3015,7 +3015,10 @@@ bool DownloadChangelog(CacheFile &Cache
        return true;
  
     // error
 -   return _error->Error("changelog download failed");
 +   pkgRecords Recs(CacheFile);
 +   pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
 +   string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
 +   return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str());
  }
                                                                        /*}}}*/
  // DisplayFileInPager - Display File with pager                               /*{{{*/
@@@ -3174,8 -3187,6 +3190,6 @@@ bool ShowHelp(CommandLine &CmdL
        "   clean - Erase downloaded archive files\n"
        "   autoclean - Erase old downloaded archive files\n"
        "   check - Verify that there are no broken dependencies\n"
-       "   markauto - Mark the given packages as automatically installed\n"
-       "   unmarkauto - Mark the given packages as manually installed\n"
        "   changelog - Download and display the changelog for the given package\n"
        "   download - Download the binary package into the current directory\n"
        "\n"

diff --combined cmdline/makefile
index 12418bd2840bce7518758b20a99a5e3757de9ac0,e867dae73654fb573bdcaabc09ddf2fe5795261e..82bbfcfe6dfd2365d7f5ffde23d01a681c026ef6
--- 1/cmdline/makefile
--- 2/cmdline/makefile
+++ b/cmdline/makefile
@@@ -54,15 -54,14 +54,16 @@@ TARGET=progra
  include $(COPY_H)
  
  # The apt-mark program
- SOURCE=apt-mark
- TO=$(BIN)
- TARGET=program
- include $(COPY_H)
+ PROGRAM=apt-mark
+ SLIBS = -lapt-pkg $(INTLLIBS)
+ LIB_MAKES = apt-pkg/makefile
+ SOURCE = apt-mark.cc
+ include $(PROGRAM_H)
  
  # The apt-report-mirror-failure program
  #SOURCE=apt-report-mirror-failure
  #TO=$(BIN)
  #TARGET=program
  #include $(COPY_H)
 +
 +

diff --combined debian/changelog
index 5c606de50c253aca9f1fc8d1f6aee871f3b4f62e,7598a139d5b76c77a35aa02dc8cb43f4811a565c..5501c097bf2417206d28a46fbe558c2202c40617
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,98 -1,112 +1,218 @@@
++apt (0.8.15ubuntu1) UNRELEASED; urgency=low
++
++  * merged from debian-unstable, remainging changes:  
++    - use ubuntu keyring and ubuntu archive keyring in apt-key
++    - run update-apt-xapian-index in apt.cron
++    - support apt-key net-update and verify keys against master-keyring
++    - run apt-key net-update in cron.daily
++    - different example sources.list
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Jun 2011 22:40:06 +0100
++
+ apt (0.8.15) unstable; urgency=low
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/depcache.cc:
+     - Really release action groups only once (Closes: #622744)
+     - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+   * apt-pkg/acquire-item.cc:
+     - Reject files known to be invalid (LP: #346386) (Closes: #627642)
+   * debian/apt.cron.daily:
+     - Check power after wait, patch by manuel-soto (LP: #705269)
+   * debian/control:
+     - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+       unpacked if a library is too old and thus break upgrades
+   * doc/apt-key.8.xml:
+     - Document apt-key net-update (LP: #192810)
+ 
+   [ Christian Perrier ]
+   * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
+   * Italian translation update (Milo Casagrande). Closes: #627834
+   * German documentation translation update (Chris Leick). Closes: #629949
+   * Catalan translation update (Jordi Mallach). Closes: #630657
+ 
+   [ David Kalnischkies ]
+   * fix a bunch of cppcheck warnings/errors based on a patch by
+     Niels Thykier, thanks! (Closes: #622805)
+   * apt-pkg/depcache.cc:
+     - really include 'rc' packages in the delete count by fixing a
+       typo which exists since 1999 in the source… (LP: #761175)
+     - if critical or-group can't be satisfied, exit directly.
+   * apt-pkg/acquire-method.cc:
+     - write directly to stdout instead of creating the message in
+       memory first before writing to avoid hitting limits
+     - fix order of CurrentURI and UsedMirror in Status() and Log()
+   * apt-pkg/orderlist.cc:
+     - let VisitRProvides report if the calls were successful
+   * apt-pkg/deb/dpkgpm.cc:
+     - replace obsolete usleep with nanosleep
+     - remove invalid pkgcache.bin and rebuild it if possible
+     - log reinstall commands in history.log
+   * debian/apt{,-utils}.symbols:
+     - update both experimental symbol-files to reflect 0.8.14 state
+   * debian/rules:
+     - remove unused embedded jquery by doxygen from libapt-pkg-doc
+   * cmdline/apt-mark.cc:
+     - reimplement apt-mark in c++
+     - provide a 'showmanual' command (Closes: #582791)
+     - provide a 'dpkg --set-selections' wrapper to set/release holds
+   * cmdline/apt-get.cc:
+     - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+   * cmdline/apt-cache.cc:
+     - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
+   * apt-pkg/pkgcache.cc:
+     - really ignore :arch in FindPkg() in non-multiarch environment
+   * doc/po/de.po:
+     - undo the translation of the command 'dump' in manpage of apt-config
+       as report by Burghard Grossmann on debian-l10n-german, thanks!
+   * apt-pkg/deb/debmetaindex.cc:
+     - do not download TranslationIndex if no Translation-* will be
+       downloaded later on anyway (Closes: #624218)
+   * test/versions.lst:
+     - disable obscure version number tests with versions dpkg doesn't
+       allow any more as they don't start with a number
+   * apt-pkg/acquire-worker.cc:
+     - print filename in the unmatching size warning (Closes: #623137)
+   * apt-pkg/acquire-item.cc:
+     - apply fix for poorly worded 'locate file' error message from
+       Ben Finney, thanks! (Closes: #623171)
+   * methods/http.cc:
+     - add config option to ignore a closed stdin to be able to easily
+       use the method as a simple standalone downloader
+     - Location header in redirects should be absolute URI, but some
+       servers just send an absolute path so still deal with it properly
+     - dequote URL taken from Location in redirects as we will otherwise
+       quote an already quoted string in the request later (Closes: #602412)
+   * apt-pkg/contrib/netrc.cc:
+     - replace non-posix gnu-extension strdupa with strdup
+   * apt-pkg/packagemanager.cc:
+     - ensure for Multi-Arch:same packages that they are unpacked in
+       lock step even in immediate configuration (Closes: #618288)
+   * apt-pkg/init.cc:
+     - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
+   * cmdline/apt-config.cc:
+     - show Acquire::Languages and APT::Architectures settings
+       in 'dump' (Closes: 626739)
+   * apt-pkg/orderlist.cc:
+     - ensure that an old version of a package with a provides can
+       never satisfy a dependency of a newer version of this package
+ 
+   [ Michael Vogt ]
+   * methods/mirror.cc:
+     - ignore lines starting with "#" in the mirror file
+     - ignore non http urls in the mirrors
+     - append the dist (e.g. sid, wheezy) as a query string when
+       asking for a suitable mirror 
+   * apt-pkg/deb/deblistparser.cc:
+     - include all known languages when building the apt cache
+       (LP: #794907)
+   * apt-pkg/deb/debindexfile.cc:
+     - remove some no longer valid checks for "TranslationsAvailable()"
+ 
+   [ Kenneth Solbø Andersen ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - set permissions of term.log to root.adm and 644 (LP: #404724)
+   
+   [ Chris Leick ]
+   * various typo and syntax corrections in doc/*.xml
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
+ 
 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.conf.changelog:
 +    - add missing ";", thanks to Julian Andres Klode
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - updated allocate memory string
 +    - cannot access archive string is lowercase
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
 +      attachments
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 15 Jun 2011 14:00:43 -0700
 +
 +apt (0.8.14.1ubuntu7) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/deblistparser.cc:
 +    - include all known languages when building the apt cache
 +      (LP: #794907)
 +  * apt-pkg/deb/debindexfile.cc:
 +    - remove some no longer valid checks for "TranslationsAvailable()"
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Jun 2011 13:56:25 +0200
 +
 +apt (0.8.14.1ubuntu6) oneiric; urgency=low
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - prevent reporting of package installation failures due to inaccessible
 +      local files (LP: #791102, #790040)
 +    - include /var/log/apt/history.log in apport-package reports so we know
 +      the context for the package management request
 +    
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Jun 2011 15:55:07 +0200
 +
 +apt (0.8.14.1ubuntu5) oneiric; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - do not reject empty Packages files when checking them for
 +      correctness
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 May 2011 10:41:30 +0200
 +
 +apt (0.8.14.1ubuntu4) oneiric; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 May 2011 17:12:27 +0200
 +
 +apt (0.8.14.1ubuntu3) oneiric; urgency=low
 +
 +  * Rebuild with recent binutils. LP: #774175.
 +
 + -- Matthias Klose <doko@ubuntu.com>  Mon, 23 May 2011 19:15:34 +0200
 +
 +apt (0.8.14.1ubuntu2) oneiric; urgency=low
 +
 +  * debian/rules:
 +    - build in verbose mode by default (thanks to Matthias Klose)
 +  * debian/control:
 +    - add  temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 May 2011 13:58:10 +0200
 +
 +apt (0.8.14.1ubuntu1) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Apr 2011 17:55:20 +0200
 +
  apt (0.8.14.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc:
@@@ -135,42 -149,6 +255,42 @@@ apt (0.8.14) unstable; urgency=lo
  
   -- Julian Andres Klode <jak@debian.org>  Fri, 15 Apr 2011 14:28:15 +0200
  
 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - stop reporting of apport-package bug reports regarding
 +      dpkg I/O errors (LP: #767776)
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 20 Apr 2011 15:05:12 -0700
 +
 +apt (0.8.13.2ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - run unattended-upgrades even if there was a error during
 +      the apt-get update (LP: #676295)
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/indexcopy.cc:
 +    - Use RealFileExists() instead of FileExists(), allows amongst other
 +      things a directory named Sources to exist on a CD-ROM (LP: #750694).
 +  
 +  [ David Kalnischkies  ]
 +  * apt-pkg/pkgcache.cc:
 +    - use the native Architecture stored in the cache header instead of
 +      loading it from configuration as suggested by Julian Andres Klode
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Apr 2011 12:52:21 +0200
 +
 +apt (0.8.13.2ubuntu1) natty; urgency=low
 +
 +  * merge fixes from debian-sid, most notable the handling of
 +    arch=all architectures in python-apt (LP: #733741)
 +  * apt-pkg/aptconfiguration.cc:
 +    - fix comparing for a empty string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 13:19:56 +0200
 +
  apt (0.8.13.2) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -207,12 -185,6 +327,12 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 05 Apr 2011 09:40:28 +0200
  
 +apt (0.8.13.1ubuntu1) natty; urgency=low
 +
 +  * merged fixes from the debian-sid (LP: #744832)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Apr 2011 14:40:51 +0200
 +
  apt (0.8.13.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc: Use stat buffer if stat was
@@@ -220,24 -192,6 +340,24 @@@
  
   -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
  
 +apt (0.8.13ubuntu2) natty; urgency=low
 +
 +  * po/makefile:
 +    - add hack to run MSGMERGE again if it segfaults. this is to help
 +      powerpc to bootstrap
 +  * mirror method:
 +    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
 +    - do not crash if the mirror file fails to download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Mar 2011 18:01:38 +0100
 +
 +apt (0.8.13ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the
 +    apt mirror method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 08:23:19 +0100
 +
  apt (0.8.13) unstable; urgency=low
  
    [ Thorsten Spindler ]
@@@ -259,29 -213,6 +379,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
  
 +apt (0.8.12ubuntu2) unstable; urgency=low
 +
 +  [ Thorsten Spindler ]
 +  * methods/rsh.cc
 +    - fix rsh/ssh option parsing (LP: #678080), thanks to
 +      Ville Mattila 
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - mark pkgAcqIndexTrans as Index-File to avoid asking the
 +      user to insert the CD on each apt-get update
 +  * methods/mirror.cc:
 +    - improve debug output and fix bug in TryNextMirror
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 +
 +apt (0.8.12ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the udev based
 +    cdrom handling and multiarch handling
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 16:12:22 +0100
 +
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -335,23 -266,6 +455,23 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 10 Mar 2011 14:46:48 +0100
  
 +apt (0.8.11.5ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debindexfile.cc:
 +    - ignore missing deb-src files in /var/lib/apt/lists, thanks
 +      to Thorsten Spindler (LP: #85590)
 +  * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
 +    - honor Dpkg::Chroot-Directory in the RunScripts*() methods
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Mar 2011 17:39:30 +0100
 +
 +apt (0.8.11.5ubuntu1) natty; urgency=low
 +
 +  * Merged from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Feb 2011 12:01:19 +0100
 +
  apt (0.8.11.5) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -583,27 -497,6 +703,27 @@@ apt (0.8.10.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 17 Jan 2011 13:41:04 +0100
  
 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - ignore lzma "Cannot allocate memory" errors, thanks to Brian
 +      Murray
 +    - add i18n support for the "short read in buffer_copy %s" handling
 +      from dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Jan 2011 18:26:05 +0100
 +
 +apt (0.8.10ubuntu1) natty; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * cmdline/apt-cache.cc: Create an error for apt-cache depends
 +    if packages could not found (LP: #647045)
 +  
 +  [ Michael Vogt ]
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Dec 2010 15:53:49 +0100
 +
  apt (0.8.10) unstable; urgency=low
  
    [ Programs translations ]
@@@ -623,48 -516,6 +743,48 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 30 Nov 2010 10:42:17 +0100
  
 +apt (0.8.9ubuntu4) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - set timeout of wget for net-update to 90 seconds (thanks to \sh)
 +
 +  [ Martin Pitt ]
 +  * Revert r1819 and r1820 to disable compressed indexes by default again.
 +    Testing has brought up a few places where this seriously degrades
 +    performance, mostly in applications which iterate through all available
 +    package records, like update-apt-xapian-index or synaptic. See
 +    https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 25 Nov 2010 08:50:37 +0100
 +
 +apt (0.8.9ubuntu3) natty; urgency=low
 +
 +  * methods/http.cc:
 +    - do not hang if Acquire::http::ProxyAutoDetect can not be
 +      executed or returns no data (LP: #654393)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:42:50 +0100
 +
 +apt (0.8.9ubuntu2) natty; urgency=low
 +
 +  * drop apt-changelog, apt-get changelog implements all the 
 +    features it provides
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:22:40 +0100
 +
 +apt (0.8.9ubuntu1) natty; urgency=low
 +
 +  * re-merged from the debian-sid bzr branch
 +  * merged lp:~mvo/apt/mvo, this brings two new commands:
 +    - apt-get download binary-pkgname to download a deb
 +    - apt-get changelog binary-pkgname to display the changelog
 +  * cmdline/apt-get.cc:
 +    - if the changelog download failed, do not show the generic error
 +      but point to launchpad instead
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:02:14 +0100
 +
  apt (0.8.9) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -696,47 -547,6 +816,47 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Nov 2010 09:25:04 +0100
  
 +apt (0.8.8ubuntu3) natty; urgency=low
 +
 +  * cmdline/apt-changelog: Filter out multiple results for a source package,
 +    just take the latest one.
 +  * cmdline/apt-changelog: Read server name from configuration
 +    APT::Changelog::Server instead of hardcoding it. This allows local users
 +    to point to a local changelog mirror, or make this script work for Debian.
 +  * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
 +    server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
 +  * doc/apt-changelog.1.xml: Document the new option.
 +  * test/integration/test-compressed-indexes, test/test-indexes.sh:
 +    - Explicitly disable compressed indexes at the start. This ensures that we
 +      will actually test uncompressed indexes regardless of the internal
 +      default value of Acquire::GzipIndexes.
 +  * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
 +    store compressed indexes. This feature is now mature enough for general
 +    consumption. Update doc/apt.conf.5.xml accordingly.
 +  * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
 +    to preferring "gz", so that compressed indexes will actually work.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Nov 2010 12:14:15 +0100
 +
 +apt (0.8.8ubuntu2) natty; urgency=low
 +
 +  * Add cmdline/apt-changelog: Script to fetch package changelog from
 +    changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
 +  * Add doc/apt-changelog.1.xml, and install it in debian/rules.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 09 Nov 2010 11:32:27 +0100
 +
 +apt (0.8.8ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Oct 2010 10:07:09 -0400
 +
  apt (0.8.8) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -756,17 -566,6 +876,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 28 Oct 2010 21:22:21 +0200
  
 +apt (0.8.7ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Oct 2010 18:31:17 +0200
 +
  apt (0.8.7) unstable; urgency=low
  
    [ Manpages translations ]
@@@ -885,92 -684,6 +1005,92 @@@ apt (0.8.4) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
 +apt (0.8.3ubuntu7) maverick; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - do not remove packages which the user requested for installation
 +      explicitly while satisfying other install requests (Closes: #598669)
 +    Test case: debootstrap, install exim4, run "apt-get install postfix"
 +    This will result in exim4-heavy instead of postfix
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200
 +
 +apt (0.8.3ubuntu6) maverick; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - source /etc/default/locale (if available) so that the 
 +      apt-get update cron job fetches the right translated package
 +      descriptions (LP: #652951)
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - do not check endpointer packages instead of only those which prevented
 +      NeverAutoRemove settings from having an effect (Closes: #598452)
 +  * cmdline/apt-cache.cc:
 +    - use the TranslatedDescription for searching and not the first
 +      available one as it is maybe not an expected language (Closes: #597925)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
 +
 +apt (0.8.3ubuntu5) maverick; urgency=low
 +
 +  * debian/apt.dirs:
 +    - add missing /usr/share/apt so that the keyring is installed
 +      into the right place (LP: #620576)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Sep 2010 18:34:18 +0200
 +
 +apt (0.8.3ubuntu4) maverick; urgency=low
 +
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
 +    with conflicts/breaks against virtual packages (LP: #614993)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Sep 2010 19:48:26 +0200
 +
 +apt (0.8.3ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/cdromutl.cc:
 +    - if apt-cdrom is used on writable media (like usb-sticks), do
 +      not use the root directory to identify the medium (as all 
 +      changes there change the ident id). Use the .disk directory 
 +      instead 
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/writer.cc:
 +    - null the valid string instead of the date if Valid-Until is not set
 +  * apt-pkg/acquire-item.cc:
 +    - use also unsigned Release files again (Closes: #596189)
 +
 +  [ Christian Perrier ]
 +  * Fix missing space after dot in a message from apt-pkg
 +    Translations unfuzzied. Thanks to Holger Wansing.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Sep 2010 21:45:49 +0200
 +
 +apt (0.8.3ubuntu2) maverick; urgency=low
 +
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
 +
 +apt (0.8.3ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
  apt (0.8.3) unstable; urgency=low
  
    [ Programs translations ]
@@@ -1063,89 -776,26 +1183,89 @@@ apt (0.8.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
 -apt (0.8.0) unstable; urgency=low
 -
 -  [ Michael Vogt ]
 -  * merge of the debian-expermental-ma branch
 -  * refresh po/pot files in doc/ and po/
 +apt (0.8.0ubuntu3) maverick; urgency=low
  
 +  * merged fixes from the debian-sid bzr branch:
 +  
    [ Programs translations ]
 -  * Swedish (Daniel Nylander). Closes: #592366
 -  * French (Christian Perrier)
 +  * Simplified Chinese (Aron Xu). Closes: #594458
 +  * Bulgarian (Damyan Ivanov). Closes: #594627
 +  * Portuguese (Miguel Figueiredo). Closes: #594668
 +  * Korean (Changwoo Ryu). Closes: #594809
  
    [ Manpages translations ]
 -  * French (Christian Perrier)
 -
 - -- Michael Vogt <mvo@debian.org>  Tue, 24 Aug 2010 16:32:19 +0200
 -
 -apt (0.8.0~pre2) experimental; urgency=low
 +  * Portuguese (Américo Monteiro)
  
    [ David Kalnischkies ]
 -  * apt-pkg/contrib/strutl.cc:
 -    - fix error checking for vsnprintf in its safe variant
 +  * cmdline/apt-cache.cc:
 +    - remove useless GetInitialize method
 +  * cmdline/apt-get.cc:
 +    - remove direct calls of ReadMainList and use the wrapper instead
 +      to protect us from useless re-reads and two-times notice display
 +    - remove death code by removing unused GetInitialize
 +  * apt-pkg/depcache.cc:
 +    - now that apt-get purge works on 'rc' packages let the MarkDelete
 +      pass this purge forward to the non-pseudo package for pseudos
 +  * apt-pkg/contrib/fileutl.cc:
 +    - apply SilentlyIgnore also on files without an extension
 +  * apt-pkg/contrib/configuration.cc:
 +    - fix autoremove by using correct config-option name and
 +      don't make faulty assumptions in error handling (Closes: #594689)
 +  * apt-pkg/versionmatch.cc:
 +    - let the pin origin actually work as advertised in the manpage
 +      which means "" are optional and pinning a local archive does
 +      work - even if it is a non-flat archive (Closes: #594435)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 17:05:53 +0200
 +
 +apt (0.8.0ubuntu2) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Thai (Theppitak Karoonboonyanan). Closes: #592695
 +  * Russian (Yuri Kozlov). Closes: #594232
 +  * Slovak (Ivan Masár). Closes: #594255
 +  * Swedish (Daniel Nylander). Closes: #594241
 +  * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
 +  * Italian (Milo Casagrande). Closes: #594238
 +  * Asturian (maacub). Closes: #594303
 +
 +  [ Christian Perrier ]
 +  * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
 +    Closes: #594211
 +
 +  [ David Kalnischkies ]
 +  * show in madison command again also source packages (LP: #614589)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Aug 2010 18:56:23 +0200
 +
 +apt (0.8.0ubuntu1) maverick; urgency=low
 +
 +  * merged from debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
 +
 +apt (0.8.0) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merge of the debian-expermental-ma branch
 +  * refresh po/pot files in doc/ and po/
 +
 +  [ Programs translations ]
 +  * Swedish (Daniel Nylander). Closes: #592366
 +  * French (Christian Perrier)
 +
 +  [ Manpages translations ]
 +  * French (Christian Perrier)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 24 Aug 2010 16:32:19 +0200
 +
 +apt (0.8.0~pre2) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - fix error checking for vsnprintf in its safe variant
    * methods/bzip2.cc:
      - fix error checking for read in case of failing bzip2/lzma/whatever
    * debian/apt.cron.daily:
@@@ -1168,20 -818,6 +1288,20 @@@
  
   -- Michael Vogt <mvo@debian.org>  Mon, 23 Aug 2010 19:09:08 +0200
  
 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - enable apport reports again (got lost in the previous merge),
 +      thanks to Matt Zimmerman
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Aug 2010 13:53:09 +0200
 +
 +apt (0.8.0~pre1ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian/experimental
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Aug 2010 17:49:40 +0200
 +
  apt (0.8.0~pre1) experimental; urgency=low
  
    [ Programs translations ]
@@@ -1224,56 -860,6 +1344,56 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 13 Aug 2010 17:00:49 +0200
  
 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Add WriteAtomic mode.
 +    - Revert WriteEmpty to old behavior (LP: #613211)
 +  * apt-pkg, methods:
 +    - Convert users of WriteEmpty to WriteAtomic.
 +  * apt-pkg/depcache.cc:
 +    - Only try upgrade for Breaks if there is a newer version, otherwise
 +      handle it as Conflicts (by removing it) (helps for #591882).
 +  
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - Add recommends on gnupg to apt, apt-key uses it.
 +      (changed from debian)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Aug 2010 12:01:30 +0200
 +
 +apt (0.7.26~exp12ubuntu3) maverick; urgency=low
 +
 +  [ Colin Watson ]
 +  * apt-pkg/cdrom.cc:
 +    - fix off-by-one error in DropBinaryArch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 21:04:18 +0200
 +
 +apt (0.7.26~exp12ubuntu2) maverick; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if ubuntu-keyring is not installed
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 11:47:59 +0200
 +
 +apt (0.7.26~exp12ubuntu1) maverick; urgency=low
 +
 +  * ABI break upload
 +  * merged from debian/experimental, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +  * debian/apt.postinst
 +    - drop set_apt_proxy_from_gconf(), no longer needed in maverick
 +  * apt-pkg/pkgcache.cc:
 +    - re-evaluate the architectures cache when the cache is (re)opened
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 19:32:15 +0200
 +
  apt (0.7.26~exp12) experimental; urgency=low
  
    [ Michael Vogt ]
@@@ -1888,152 -1474,6 +2008,152 @@@ apt (0.7.26~exp1) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 16:11:39 +0100
  
 +apt (0.7.25.3ubuntu10) maverick; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.conf.ubuntu:
 +    - no longer install (empty) apt.conf.d/01ubuntu
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
 +    - fix FTBFS (LP: #600155)
 +
 +  [ Matthias G. ]
 +  * apt-pkg/deb/dpkgpm.cc: 
 +    - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Jul 2010 09:37:03 +0200
 +
 +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if getent returns nothing useful (LP: #579647)
 +      thanks to Jean-Baptiste Lallement
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 14 May 2010 09:40:50 +0200
 +
 +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
 +
 +  [ Loïc Minier ]
 +  * Use https:// in Vcs-Bzr URL.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix max tag buffer size (LP: #545336, closes: #578959)
 +  * apt-pkg/indexfile.cc:
 +    - If no "_" is found in the language code, try to find a "."
 +      This is required for languages like Esperanto that have no
 +      county associated with them (LP: #560956)
 +      Thanks to "Aisano" for the fix
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 10:33:46 +0200
 +
 +apt (0.7.25.3ubuntu7) lucid; urgency=low
 +
 +  Cherry pick fixes from the lp:~mvo/apt/mvo branch:
 +
 +  [ Evan Dandrea ]
 +  * Remember hosts with general failures for
 +    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
 +  
 +  [ Michael Vogt ]
 +  * improve debug output for Debug::pkgPackageManager
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Apr 2010 20:30:03 +0200
 +
 +apt (0.7.25.3ubuntu6) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix crash when pkg.VersionList() is empty (LP: #556056)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Apr 2010 21:13:25 +0200
 +
 +apt (0.7.25.3ubuntu5) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - try version match in FindSrc first exact than fuzzy (LP: #551178)
 +
 +  [ Jean-Baptiste Lallement ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - always escape '%' (LP: #130289) (Closes: #500560)
 +    - unescape '%' sequence only if followed by 2 hex digit
 +    - username/password are urlencoded in proxy string (RFC 3986)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Mar 2010 21:59:42 +0200
 +
 +apt (0.7.25.3ubuntu4) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/debversion.cc:
 +    - consider absent of debian revision equivalent to 0 (Closes: #573592)
 +      LP: #540228
 +  * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
 +   - fix memory leaks in error conditions in DoSource()
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - fix error message construction in OpenLog()
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100
 +
 +apt (0.7.25.3ubuntu3) lucid; urgency=low
 +
 +  * apt-pkg/indexfile.cc:
 +    - remove "cs" from languages that need the full langcode when
 +      downloading translations (thanks to Steve Langasek)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Mar 2010 09:42:39 +0100
 +
 +apt (0.7.25.3ubuntu2) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * abicheck/
 +    - add new abitest tester using the ABI Compliance Checker from
 +      http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
 +  * debian/apt.conf.autoremove:
 +    - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
 +      for transitional packages
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix backgrounding when dpkg runs (closes: #486222)
 +  * cmdline/apt-mark:
 +    - show error on incorrect aguments (LP: #517917), thanks to
 +      Torsten Spindler
 +  * cmdline/apt-get.cc:
 +    - if apt-get source foo=version or foo/distro can not be found,
 +      error out (LP: #502641)
 +  * apt-pkg/indexfile.cc:
 +    - deal correctly with three letter langcodes (LP: #391409)
 +  * debian/apt.cron.daily:
 +    - do not look into admin users gconf anymore for the http proxy
 +      the user now needs to use the "Apply system-wide" UI in the
 +      gnome-control-center to set it
 +  * debian/apt.postinst:
 +    - add set_apt_proxy_from_gconf() and run that once on upgrade if
 +      there is no proxy configured already system-wide (LP: #432631)
 +      From that point on gnome-control-center will have to warn if
 +      the user makes changes to the proxy settings and does not apply
 +      them system wide
 +
 +  [ Robert Collins ]
 +  * Change the package index Info methods to allow apt-cache policy to be
 +    useful when using several different archives on the same host.
 +    (Closes: #329814, LP: #22354)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Mar 2010 23:10:52 +0100
 +
 +apt (0.7.25.3ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged with the debian-sid branch
 +  * methods/http.cc:
 +    - add Acquire::http::ProxyAutoDetect configuration that 
 +      can be used to call a external helper to figure out the 
 +      proxy configuration and return it to apt via stdout
 +      (this is a step towards WPAD and zeroconf/avahi support)
 +  
 +  [ Ivan Masár ]
 +  * Slovak translation update. Closes: #568294
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Feb 2010 23:33:32 +0100
 +
  apt (0.7.25.3) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2154,39 -1594,6 +2274,39 @@@ apt (0.7.25.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sat, 09 Jan 2010 21:52:36 +0100
  
 +apt (0.7.25ubuntu4) lucid; urgency=low
 +
 +  * cmdline/apt-cdrom.cc:
 +    - make Acquire::cdrom::AutoDetect default, this can be
 +      turned off with "--no-auto-detect"
 +  * methods/http.cc:
 +    - add cache-control headers even if no cache is given to allow
 +      adding options for intercepting proxies
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
 +
 +apt (0.7.25ubuntu3) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - don't mark as manually if in download only (Closes: #468180)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 01 Feb 2010 18:41:15 +0100
 +
 +apt (0.7.25ubuntu2) lucid; urgency=low
 +
 +  * Change history branch so that it does not break the 
 +    apt ABI for the pkgPackageManager interface
 +    (can be reverted on the next ABI break)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
 +
 +apt (0.7.25ubuntu1) lucid; urgency=low
 +
 +  * Merged from the mvo branch
 +  * merged from the lp:~mvo/apt/history branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Dec 2009 09:44:08 +0100
 +
  apt (0.7.25) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2330,29 -1737,6 +2450,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 15 Dec 2009 09:21:55 +0100
  
 +apt (0.7.24ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - include df -l output in the apport log as well (thanks to
 +      tjaalton)
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
 +  * merge lp:~mvo/apt/netrc branch, this adds support for a
 +    /etc/apt/auth.conf that can be used to store username/passwords
 +    in a "netrc" style file (with the extension that it supports "/"
 +    in a machine definition). Based on the maemo git branch.
 +
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Dec 2009 09:27:26 +0100
 +
  apt (0.7.24) unstable; urgency=low
  
    [ Nicolas François ]
@@@ -2422,59 -1806,6 +2542,59 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 25 Sep 2009 19:57:25 +0200
  
 +apt (0.7.23.1ubuntu2) karmic; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - fix Vcr-Bzr header
 +
 +  [ Kees Cook ]
 +  * debian/apt.cron.daily:
 +    - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Oct 2009 19:05:19 +0200
 +
 +apt (0.7.23.1ubuntu1) karmic; urgency=low
 +
 +  [ Matt Zimmerman ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - Suppress apport reports on dpkg short reads (these I/O errors are not 
 +      generally indicative of a bug in the packaging)
 +
 +  [ Loïc Minier ]
 +  * cmdline/apt-key:
 +    - Emit a warning if removed keys keyring is missing and skip associated
 +      checks (LP: #218971)
 +
 +  [ Brian Murray ]
 +  * cmdline/apt-get.cc:
 +    - typo fix (LP: #370094)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - when tcgetattr() returns non-zero skip all pty magic 
 +      (thanks to Simon Richter, closes: #509866)
 +  * apt-inst/contrib/arfile.cc:
 +    - show propper error message for Invalid archive members
 +  * apt-pkg/acquire-worker.cc:
 +    - show error details of failed methods
 +  * apt-pkg/contrib/fileutl.cc:
 +    - if a process aborts with signal, show signal number
 +  * methods/http.cc:
 +    - ignore SIGPIPE, we deal with EPIPE from write in 
 +      HttpMethod::ServerDie() (LP: #385144)
 +  * debian/apt.cron.daily:
 +    - if the timestamp is too far in the future, delete it 
 +      (LP: #135262)
 +  
 +  [ Merge ]
 +  * merged from debian, reverted the libdlopen-udev branch
 +    because its too late in the release process for this now
 +  * not merged the proxy behaviour change from 0.7.23 (that will
 +    be part of lucid)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Sep 2009 18:15:10 +0200
 +
  apt (0.7.23.1) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -2704,35 -2035,7 +2824,35 @@@ apt (0.7.22) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
  
 -apt (0.7.21) unstable; urgency=low
 +apt (0.7.21ubuntu1) karmic; urgency=low
 +
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Christian Perrier ]
 +  * Documentation translations:
 +    - Fix a typo in apt-get(8) French translation. Closes: #525043
 +      Thanks to Guillaume Delacour for spotting it.
 +  * Translations:
 +    - fr.po
 +    - sk.po. Closes: #525857
 +    - ru.po. Closes: #526816
 +    - eu.po. Closes: #528985
 +    - zh_CN.po. Closes: #531390
 +    - fr.po
 +    - it.po. Closes: #531758
 +    - ca.po. Closes: #531921
 +  * Added translations
 +    - ast.po (Asturian by Marcos Alvareez Costales).
 +      Closes: #529007, #529730
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire.cc:
 +    - make the (internal) max pipeline depth of the acquire queue
 +      configurable via Acquire::Max-Pipeline-Depth
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Jun 2009 15:49:07 +0200
 +
 +apt (0.7.21) unstable; urgency=low
  
    [ Christian Perrier ]
    * Translations:
@@@ -2775,125 -2078,6 +2895,125 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 14 Apr 2009 14:12:51 +0200
  
 +apt (0.7.20.2ubuntu7) karmic; urgency=low
 +
 +  * fix problematic use of tolower() when calculating the version 
 +    hash by using locale independant tolower_ascii() function. 
 +    Thanks to M. Vefa Bicakci (LP: #80248)
 +  * build fixes for g++-4.4
 +  * include dmesg output in apport package failures
 +  * include apt ordering into apport package failures
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 24 Apr 2009 10:14:01 +0200
 +
 +apt (0.7.20.2ubuntu6) jaunty; urgency=low
 +
 +  [ Jamie Strandboge ]
 +  * apt.cron.daily: catch invalid dates due to DST time changes
 +    in the stamp files (LP: #354793)
 +
 +  [ Michael Vogt ]
 +  * methods/gpgv.cc:
 +    - properly check for expired and revoked keys (closes: #433091)
 +      LP: #356012
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Apr 2009 22:39:50 +0200
 +
 +apt (0.7.20.2ubuntu5) jaunty; urgency=low
 +
 +  [ Colin Watson ]
 +  * cmdline/acqprogress.cc:
 +    - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
 +      dlstatus messages on the status-fd (LP: #290234).
 +  
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - do not clutter cron mail with bogus gconftool messages 
 +      (LP: #223502)
 +    - merge fix for cache locking from debian (closes: #459344)
 +    - run update-apt-xapian-index (with ionice) to ensure that
 +      the index is up-to-date when synaptic is run (LP: #288797)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Mar 2009 13:22:28 +0200
 +
 +apt (0.7.20.2ubuntu4) jaunty; urgency=low
 +
 +  * ftparchive/cachedb.cc:
 +    - when apt-ftparchive clean is used, compact the database
 +      at the end (thanks to cprov)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Mar 2009 13:43:59 +0100
 +
 +apt (0.7.20.2ubuntu3) jaunty; urgency=low
 +
 +  * methods/mirror.cc:
 +    - when download the mirror file and the server is down,
 +      return a propper error message (LP: #278635)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Mar 2009 15:42:15 +0100
 +
 +apt (0.7.20.2ubuntu2) jaunty; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - revert termios patch (LP: #338514)
 +  * cmdline/apt-get.cc
 +    - fix "apt-get source pkg" if there is a binary package and
 +      a source package of the same name but from different 
 +      packages (LP: #330103)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 09 Mar 2009 16:33:28 +0100
 +
 +apt (0.7.20.2ubuntu1) jaunty; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Translations:
 +    - bg.po. Closes: #513211
 +    - zh_TW.po. Closes: #513311
 +    - nb.po. Closes: #513843
 +  
 +  [ Michael Vogt ]
 +  * merged from the debian-sid branch
 +  * [ABI break] merge support for http redirects, thanks to
 +    Jeff Licquia and Anthony Towns
 +  * [ABI break] use int for the package IDs (thanks to Steve Cotton)
 +  * apt-pkg/contrib/strutl.cc:
 +    - fix TimeToStr i18n (LP: #289807)
 +  * debian/apt.conf.autoremove:
 +    - readd "linux-image" (and friends) to the auto-remove
 +     blacklist
 +  * fix some i18n issues (thanks to  Gabor Kelemen)
 +    LP: #263089
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - filter "ENOMEM" errors when creating apport reports 
 +  * cmdline/apt-get.cc:
 +    - fix "apt-get source pkg=ver" if binary name != source name
 +      (LP: #202219)
 +  * apt-pkg/indexrecords.cc:
 +    - fix some i18n issues
 +  * apt-pkg/contrib/strutl.h:
 +    - add new strprintf() function to make i18n strings easier
 +  * apt-pkg/dev/debsystem.cc:
 +    - add missing apti18n.h header
 +  * cmdline/apt-get.cc:
 +    - default to "false" for the "APT::Get::Build-Dep-Automatic"
 +      option (follow debian here)
 +  * apt-pkg/pkgcache.cc:
 +    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
 +      state (LP: #322955)
 +  * methods/https.cc:
 +    - add Acquire::https::AllowRedirect support
 +    - do not unlink files in partial/ (thanks to robbiew)
 +
 +  [ Dereck Wonnacott ]
 +  * Clarify the --help for 'purge' (LP: #243948)
 +
 +  [ Ian Weisser ]
 +  * /apt-pkg/deb/debsystem.cc:
 +    - add 'sudo' to the error message to "run 'dpkg --configure -a'"
 +      (LP: #52697)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 09 Feb 2009 14:21:05 +0100
 +
  apt (0.7.20.2) unstable; urgency=medium
  
    [ Eugene V. Lyubimkin ]
@@@ -2962,12 -2146,6 +3082,12 @@@ apt (0.7.20) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
  
 +apt (0.7.19ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
 +
  apt (0.7.19) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
@@@ -3266,90 -2444,6 +3386,90 @@@ apt (0.7.15~exp1) experimental; urgency
    
   -- Michael Vogt <mvo@debian.org>  Tue, 16 Sep 2008 21:27:03 +0200
  
 +apt (0.7.14ubuntu7) jaunty; urgency=low
 +
 +  * cmdline/apt-cache.cc:
 +    - remove the gettext from a string that consists entirely 
 +      of variables (LP: #56792)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix potential hang when in a backgroud process group
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Oct 2008 21:09:12 +0100
 +
 +apt (0.7.14ubuntu6) intrepid; urgency=low
 +
 +  * debian/apt.conf.autoremove:
 +    - remove "linux-image" (and friends) from the auto-remove
 +      blacklist. we have the kernel fallback infrastructure now
 +      in intrepid (thanks to BenC)
 +  * apt-pkg/indexcopy.cc:
 +    - support having CDs with no Packages file (just a Packages.gz)
 +      by not forcing a verification on non-existing files
 +     (LP: #255545)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve the filtering for duplicated apport reports (thanks
 +      to seb128 for pointing that problem out)
 +    - do not report disk full errors from dpkg via apport
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200
 +
 +apt (0.7.14ubuntu5) intrepid; urgency=low
 +
 +  * fix various -Wall warnings
 +  * make "apt-get build-dep" installed packages marked automatic
 +    by default. This can be changed by setting the value of
 +    APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
 +    Haviland, closes: #44874, LP: #248268)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 06 Aug 2008 14:00:51 +0200
 +
 +apt (0.7.14ubuntu4) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix uninitialized variable that caused no apport reports
 +      to be written sometimes (thanks to Matt Zimmerman)
 +  * merge patch that enforces stricter https server certificate
 +    checking (thanks to Arnaud Ebalard, closes: #485960)
 +  * allow per-mirror specific https settings
 +    (thanks to Arnaud Ebalard, closes: #485965)
 +  * add doc/examples/apt-https-method-example.cof
 +    (thanks to Arnaud Ebalard, closes: #485964)
 +  * add DPkg::NoTriggers option so that applications that call
 +    apt/aptitude (like the installer) defer trigger processing
 +    (thanks to Joey Hess) 
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
 +  [ Dereck Wonnacott ]
 +  * apt-ftparchive might write corrupt Release files (LP: #46439)
 +  * Apply --important option to apt-cache depends (LP: #16947) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Aug 2008 10:10:49 +0200
 +
 +apt (0.7.14ubuntu3) intrepid; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
 +    Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
 +  * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve apt progress reporting, display trigger actions
 +  * apt-pkg/depcache.cc:
 +    - when checking for new important deps, skip critical ones
 +      (LP: #236360)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 Jun 2008 17:27:07 +0200
 +
 +apt (0.7.14ubuntu2) intrepid; urgency=low
 +
 +  * debian/control:
 +    - fix FTBFS by adding missing intltool dependency 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 09 May 2008 13:50:22 +0200
 +
  apt (0.7.14) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -3576,364 -2670,102 +3696,364 @@@ apt (0.7.10) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 07 Jan 2008 21:40:47 +0100
  
 -apt (0.7.9) unstable; urgency=low
 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low
  
 -  [ Christian Perrier ]
 -  * Add several languages to LINGUAS and, therefore, really ship the relevant
 -    translation:
 -    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 -    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
 +  * apt-pkg/acquire-item.cc:
 +    - fix signaure removal on transient network failures LP: #220627
 +      (thanks to Scott James Remnant)
  
 -  [ Program translations ]
 -    - Korean updated. Closes: #448430
 -    - Galician updated. Closes: #448497
 -    - Swedish updated.
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 16:32:49 +0200
  
 -  [ Otavio Salvador ]
 -  * Fix configure script to check for CURL library and headers presense.
 -  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 -    to add backward support for arches that lacks pselect support,
 -    closes: #448406.
 -  * Umount CD-ROM when calling apt-cdrom ident, except when called with
 -    -m, closes: #448521.
 +apt (0.7.9ubuntu16) hardy; urgency=low
  
 - -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
 +  * cmdline/apt-key:
 +    - only check against master-keys in net-update to not break
 +      custom CDs (thanks to Colin Watson)
  
 -apt (0.7.8) unstable; urgency=low
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 14:17:14 +0200
  
 -  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 -    APT::Acquire::Translation "none" support, closes: #437523.
 -  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 -    for the Homepage field (ABI break), closes: #447970.
 -  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 -    space after cd label, closes: #448187.
 +apt (0.7.9ubuntu15) hardy; urgency=low
  
 - -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
 +  * cmdline/apt-get.cc:
 +    - do two passes when installing tasks, first ignoring dependencies,
 +      then resolving them and run the problemResolver at the end
 +      so that it can correct any missing dependencies. This should
 +      fix livecd building for kubuntu (thanks to Jonathan Riddell 
 +      for reporting the problem)
  
 -apt (0.7.7) unstable; urgency=low
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Mar 2008 23:25:45 +0100
 +
 +apt (0.7.9ubuntu14) hardy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix incorrect help output for -f (LP: #57487)
 +    - run the problemResolver after a task was installed
 +      so that it can correct any missing dependencies
 +  * typo fixes (LP: #107960)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Mar 2008 21:46:07 +0100
 +
 +apt (0.7.9ubuntu13) hardy; urgency=low
 +
 +  [ Lionel Porcheron ]
 +  * debian/apt.cron.daily:
 +    - only call gconftool if gcontool is installed (LP: #194281)
  
    [ Michael Vogt ]
 -  * apt-inst/contrib/extracttar.cc:
 -    - fix fd leak for zero size files (thanks to Bill Broadley for
 -      reporting this bug)
 -  * apt-pkg/acquire-item.cc:
 -    - remove zero size files on I-M-S hit
 -  * methods/https.cc:
 -    - only send LastModified if we actually have a file
 -    - send range request with if-range 
 -    - delete failed downloads
 -    - delete zero size I-M-S hits
 -  * apt-pkg/deb/dpkgpm.{cc,h}:
 -    - merged dpkg-log branch, this lets you specify a 
 -      Dir::Log::Terminal file to log dpkg output to
 -      (ABI break)
 -    - fix parse error when dpkg sends unexpected data
 -  * merged apt--sha256 branch to fully support the new
 -    sha256 checksums in the Packages and Release files
 -    (ABI break)
 -  * apt-pkg/pkgcachegen.cc:
 -    - increase default mmap size
 -  * tests/local-repo:
 -    - added local repository testcase
 -  * apt-pkg/acquire.cc:
 -    - increase MaxPipeDepth for the internal worker<->method
 -      communication to 1000 for the debtorrent backend
 -  * make apt build with g++ 4.3
 -  * fix missing SetExecClose() call when the status-fd is used
 +  * doc/apt_preferences.5.xml:
 +    - fix typo (LP: #150900)
 +  * doc/example/sources.list:
 +    - updated for hardy (LP: #195879)
    * debian/apt.cron.daily:
 -    - move unattended-upgrade before apt-get autoclean
 -  * fix "purge" commandline argument, closes: #133421
 -    (thanks to Julien Danjou for the patch)
 -  * cmdline/apt-get.cc:
 -    - do not change the auto-installed information if a package
 -      is reinstalled
 -  * apt-pkg/acquire-item.cc:
 -    - fix crash in diff acquire code
 -  * cmdline/apt-mark:
 -    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 -      (thanks to Laurent Bigonville)
 -  * apt-pkg/depcache.cc:
 -    - set "APT::Install-Recommends" to true by default (OMG!)
 +    - sleep random amount of time (default within 0-30min) before
 +      starting the upate to hit the mirrors less hard
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Mar 2008 15:35:09 +0100
 +
 +apt (0.7.9ubuntu12) hardy; urgency=low
 +
    * debian/apt.cron.daily:
 -    - only run the cron job if apt-get check succeeds (LP: #131719)
 -  
 -  [ Program translations ]
 -    - French updated
 -    - Basque updated. Closes: #436425
 -    - Fix the zh_CN translator's name in debian/changelog for 0.7.2
 -      Closes: #423272
 -    - Vietnamese updated. Closes: #440611
 -    - Danish updated. Closes: #441102
 -    - Thai added. Closes: #442833
 -    - Swedish updated.
 -    - Galician updated. Closes: #446626
 +    - use admin user proxy settings
 +  * cmdline/apt-get.cc:
 +    - fix task installation (thanks to Colin Watson)
  
 -  [ Otavio Salvador ]
 -  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
 -    (closes: #436055)
 -  * Reset curl options and timestamp between downloaded files. Thanks to
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Feb 2008 15:07:44 +0100
 +
 +apt (0.7.9ubuntu11) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +      (LP: #188127)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Jan 2008 12:06:12 +0100
 +
 +apt (0.7.9ubuntu10) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add "net-update" command that fetches the 
 +      ubuntu-archive-keyring.gpg and add keys from it that are 
 +      signed by the ubuntu-master-keyring.gpg 
 +      (apt-archive-key-signatures spec)
 +  * debian/apt.cron.daily:
 +    - add apt-key net-update to the nightly cron job
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Feb 2008 15:50:28 +0100
 +
 +apt (0.7.9ubuntu9) hardy; urgency=low
 +
 +  * fix FTBFS due to incorrect intltool build-depends
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 16:04:37 +0100
 +
 +apt (0.7.9ubuntu8) hardy; urgency=low
 +
 +  * share/apt-auth-failure.note:
 +    - show update-notifier note if the nightly update fails with a
 +      authentication failure (apt-authentication-reliability spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 14:04:56 +0100
 +
 +apt (0.7.9ubuntu7) hardy; urgency=low
 +
 +  * methods/connect.cc:
 +    - remember hosts with Resolve failures or connect Timeouts
 +      see https://wiki.ubuntu.com/NetworklessInstallationFixes
 +  * cmdlines/apt-key:
 +    - fix bug in the new apt-key update code that imports only
 +      keys signed with the master key (thanks to cjwatson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 08 Feb 2008 11:38:35 +0100
 +
 +apt (0.7.9ubuntu6) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add support for a master-keyring that contains signing keys
 +      that can be used to sign the archive signing keys. This should
 +      make key-rollover easier.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - merged patch from Kees Cook to fix anoying upper-case display
 +      on amd64 in sbuild
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +    - Make the breaks handling use the kill list. This means, that a
 +      Breaks: Pkg (<< version) may put Pkg onto the remove list.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add APT::Apport::MaxReports to limit the maximum number
 +      of reports generated in a single run (default to 3)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add missing "Release" file uri when apt-get update --print-uris
 +      is run
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Feb 2008 14:28:02 +0100
 +
 +apt (0.7.9ubuntu5) hardy; urgency=low
 +
 +  * Merged apt-authentication-reliabilty branch. This means
 +    that apt will refuse to update and use the old lists if
 +    the authentication of a repository that used to be 
 +    authenticated fails. See
 +    https://wiki.ubuntu.com/AptAuthenticationReliability
 +    for more details.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Jan 2008 10:36:10 +0100
 +
 +apt (0.7.9ubuntu4) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc:
 +    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
 +      true, the effect of the compatibility code was to require both of them
 +      to be set to false in order to disable list cleanup; this broke the
 +      installer. Instead, disable list cleanup if either of them is set to
 +      false.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 09 Jan 2008 22:34:37 +0000
 +
 +apt (0.7.9ubuntu3) hardy; urgency=low
 +
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Jan 2008 19:02:11 +0100
 +
 +apt (0.7.9ubuntu2) hardy; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
 +    with newest dpkg-shlibdeps changing the packaging building order and a
 +    patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
 +    closes: #452862.
 +  * Applied patch from Alexander Winston <alexander.winston@comcast.net>
 +    to use 'min' as symbol for minute, closes: #219034.
 +  * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
 +    work properly in initramfs, closes: #448316.
 +  * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
 +    apt-get to ignore time conflicts, closes: #451328.
 +  * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
 +    grammatical error ("manual installed" -> "manually installed"),
 +    closes: #438136.
 +  * Fix cron.daily job to not call fail if apt isn't installed, closes:
 +    #443286.
 +  
 +  [ Daniel Burrows ]
 +  * apt-pkg/contrib/configuration.cc:
 +    - if RootDir is set, then FindFile and FindDir will return paths
 +      relative to the directory stored in RootDir, closes: #456457.
 +
 +  [ Christian Perrier ]
 +  * Fix wording for "After unpacking...". Thans to Michael Gilbert
 +    for the patch. Closes: #260825
 +
 +  [ Program translations ]
 +    - Vietnamese updated. Closes: #453774
 +    - Japanese updated. Closes: #456909
 +    - French updated.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.{cc,h}:
 +    - propergate the Immediate flag to make hitting the 
 +      "E: Internal Error, Could not perform immediate configuration (2)"
 +      harder. (LP: #179247)
 +  * debian/apt.conf.daily:
 +    - print warning if the cache can not be locked (closes: #454561),
 +      thanks to Bastian Kleineidam
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Jan 2008 11:31:45 +0100
 +
 +apt (0.7.9ubuntu1) hardy; urgency=low
 +
 +  * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
 +    changes:
 +    - mirror download method (pending merge with debian)
 +    - no pdiff download by default (unsuitable for ubuntu)
 +    - no recommends-by-default yet
 +    - add "Original-Maintainer" field to tagfile
 +    - show warning on apt-get source if the package is maintained
 +      in a VCS (pedinging merge with debian)
 +    - use ubuntu-archive keyring instead of debians one
 +    - support metapackages section for autoremoval
 +    - debian maintainer field change
 +    - send ubuntu string in user-agent
 +  
 +  * Changes from the debian-sid bzr branch (but not uploaded to debian
 +    yet):
 +  
 +  [ Otavio Salvador ]
 +  * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
 +    apt-mark, closes: #430207.
 +  * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
 +    note about some frontends in apt.8 manpage, closes: #438545.
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
 +    getting crazy when /dev/null is redirected to stdin (which breaks
 +    buildds), closes: #452858.
 +
 +  [ Program translations ]
 +    - Basque updated. Closes: #453088
 +
 +  [ Michael Vogt ]
 +  * debian/rules
 +    - fix https install location
 +  * methods/gpgv.cc:
 +    - remove cruft code that caused timestamp/I-M-S issues
 +  * ftparchive/contents.cc:
 +    - fix error output
 +  * methods/mirror.{cc,h}:
 +    - only update mirror list on IndexFile updates 
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - make the authentication download code more robust against
 +      servers/proxies with broken If-Range implementations
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 +  [ Chris Cheney ]
 +  * ftparchive/contents.cc:
 +    - support lzma data members
 +  * ftparchive/multicompress.cc:
 +    - support lzma output
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Dec 2007 14:46:27 +0100
 +
 +apt (0.7.9) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Add several languages to LINGUAS and, therefore, really ship the relevant
 +    translation:
 +    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 +    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
 +
 +  [ Program translations ]
 +    - Korean updated. Closes: #448430
 +    - Galician updated. Closes: #448497
 +    - Swedish updated.
 +
 +  [ Otavio Salvador ]
 +  * Fix configure script to check for CURL library and headers presense.
 +  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 +    to add backward support for arches that lacks pselect support,
 +    closes: #448406.
 +  * Umount CD-ROM when calling apt-cdrom ident, except when called with
 +    -m, closes: #448521.
 +
 + -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
 +
 +apt (0.7.8) unstable; urgency=low
 +
 +  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 +    APT::Acquire::Translation "none" support, closes: #437523.
 +  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 +    for the Homepage field (ABI break), closes: #447970.
 +  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 +    space after cd label, closes: #448187.
 +
 + -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
 +
 +apt (0.7.7) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have a file
 +    - send range request with if-range 
 +    - delete failed downloads
 +    - delete zero size I-M-S hits
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - merged dpkg-log branch, this lets you specify a 
 +      Dir::Log::Terminal file to log dpkg output to
 +      (ABI break)
 +    - fix parse error when dpkg sends unexpected data
 +  * merged apt--sha256 branch to fully support the new
 +    sha256 checksums in the Packages and Release files
 +    (ABI break)
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size
 +  * tests/local-repo:
 +    - added local repository testcase
 +  * apt-pkg/acquire.cc:
 +    - increase MaxPipeDepth for the internal worker<->method
 +      communication to 1000 for the debtorrent backend
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes: #133421
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled
 +  * apt-pkg/acquire-item.cc:
 +    - fix crash in diff acquire code
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 +      (thanks to Laurent Bigonville)
 +  * apt-pkg/depcache.cc:
 +    - set "APT::Install-Recommends" to true by default (OMG!)
 +  * debian/apt.cron.daily:
 +    - only run the cron job if apt-get check succeeds (LP: #131719)
 +  
 +  [ Program translations ]
 +    - French updated
 +    - Basque updated. Closes: #436425
 +    - Fix the zh_CN translator's name in debian/changelog for 0.7.2
 +      Closes: #423272
 +    - Vietnamese updated. Closes: #440611
 +    - Danish updated. Closes: #441102
 +    - Thai added. Closes: #442833
 +    - Swedish updated.
 +    - Galician updated. Closes: #446626
 +
 +  [ Otavio Salvador ]
 +  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
 +    (closes: #436055)
 +  * Reset curl options and timestamp between downloaded files. Thanks to
      Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
    * Add support to apt-key to export keys to stdout. Thanks to "Dwayne
      C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
@@@ -3963,193 -2795,6 +4083,193 @@@
   
   -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
  
 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - give up timeslice on EIO error in read from master terminal
 +  * debian/apt.cron.daily:
 +    - only run the cron job if apt-get check succeeds (LP: #131719)
 +
 +  [ Martin Emrich ]  
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - rewrite dpkgpm.cc to use pselect() instead of select()
 +      to block signals during select() (LP: #134858)
 + 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 20 Oct 2007 07:51:12 +0200
 +
 +apt (0.7.6ubuntu14) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix resource leak (LP: #148806) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Oct 2007 20:57:44 +0200
 +
 +apt (0.7.6ubuntu13) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix crash in WriteApportReport (LP: #144537)
 +  * apt-pkg/acquire-item.cc
 +    - fix disappearing local Packages.gz file (LP: #131166)
 +  * methods/https.cc:
 +    - fix off-by-one error I-M-S handling
 +    - cleanup after I-M-S hit
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Oct 2007 01:48:26 +0200
 +
 +apt (0.7.6ubuntu12) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file
 +      (thanks to Laurent Bigonville, LP: #140019)
 +  * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
 +      in unspecified behaviour;
 +  * Reset curl options and timestamp between downloaded files. Thanks to
 +    Ryan Murray <rmurray@debian.org> for the patch
 +
 +  [Paul Sladen]
 +  * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
 +    to the bit bucket.  Thanks to 'dasdda'.  (LP: #115397)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 03 Oct 2007 02:17:45 +0200
 +
 +apt (0.7.6ubuntu11) gutsy; urgency=low
 +
 +  * apt-pkg/contrib/mmap.cc:
 +    - don't fail if msync() returns > 0 (LP: #144001)
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Sat, 22 Sep 2007 21:39:29 +0100
 +
 +apt (0.7.6ubuntu10) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix parse error when dpkg sends unexpected data
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Sep 2007 17:25:09 +0100
 +
 +apt (0.7.6ubuntu9) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix progress reporting precent calculation (LP: #137798)
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +    (LP: #136767)
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes LP: #125733
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled (LP: #139448)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 +
 +apt (0.7.6ubuntu8) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - fix bug in dpkg log writing when a signal is caught during
 +      select() (LP: #134858)
 +    - write end marker in the log as well
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Sep 2007 15:03:46 +0200
 +
 +apt (0.7.6ubuntu7) gutsy; urgency=low
 +
 +  * reupload to fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Aug 2007 19:44:20 +0200
 +
 +apt (0.7.6ubuntu6) gutsy; urgency=low
 +
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Wed, 15 Aug 2007 20:44:37 +0100
 +
 +apt (0.7.6ubuntu5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - fix file removal on local repo i-m-s hit (LP: #131166)
 +  * tests/local-repo:
 +    - added regression test for this bug
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Aug 2007 12:34:07 +0200
 +
 +apt (0.7.6ubuntu4) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - remove YnPrompt when a XS-Vcs- tag is found, improve the
 +      notice (LP: #129575)
 +  * methods/copy.cc:
 +    - take hashes here too
 +  * apt-pkg/acquire-worker.cc:
 +    - only pass on computed hash if we recived one from the method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Aug 2007 19:30:29 +0200
 +
 +apt (0.7.6ubuntu3) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix packagename extraction when writting apport reports
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size (LP: #125640)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 +
 +apt (0.7.6ubuntu2) gutsy; urgency=low
 +
 +  * doc/examples/sources.list:
 +    - change example source to gutsy
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - do not break if no /dev/pts is available
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 06 Aug 2007 15:17:57 +0200
 +
 +apt (0.7.6ubuntu1) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have a file
 +    - send range request with if-range 
 +    - delete failed downloads
 +    (thanks to Thom May for his help here)
 +    - delete zero size I-M-S hits
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - merged dpkg-log branch, this lets you specify a 
 +      Dir::Log::Terminal file to log dpkg output to
 +    (ABI break)
 +    - when writting apport reports, attach the dpkg
 +      terminal log too
 +  * merged apt--sha256 branch to fully support the new
 +    sha256 checksums in the Packages and Release files
 +    (ABI break)
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size
 +  * tests/local-repo:
 +    - added local repository testcase
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes: #133421
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 +      (thanks to Laurent Bigonville)
 +
 +  [ Ian Jackson ]
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 +
  apt (0.7.6) unstable; urgency=low
  
    * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@@ -4177,14 -2822,6 +4297,14 @@@ apt (0.7.5) unstable; urgency=lo
  
   -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
  
 +apt (0.7.4ubuntu1) gutsy; urgency=low
 +
 +  * debian/apt.conf.ubuntu, apt.conf.autoremove:
 +    - Change metapackages to {restricted,universe,multiverse}/metapackages 
 +      in Install-Recommends-Sections and Never-MarkAuto-Sections
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Jul 2007 10:42:29 +0200
 +
  apt (0.7.4) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -4245,90 -2882,6 +4365,90 @@@ apt (0.7.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sun, 01 Jul 2007 12:31:29 +0200
  
 +apt (0.7.2ubuntu7) gutsy; urgency=low
 +
 +  * fix build-dependencies 
 +  * fixes in the auto-mark code (thanks to Daniel
 +    Burrows)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  9 Jul 2007 19:02:54 +0200
 +
 +apt (0.7.2ubuntu6) gutsy; urgency=low
 +
 +  [ Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - make the XS-Vcs-$foo warning more copy'n'paste
 +      friendly (thanks to Matt Zimmerman)
 +    - ignore the Vcs-Browser tag (Fixes LP: #121770)
 +  * debian/apt.conf.autoremove:
 +    - added "linux-ubuntu-modules" to APT::NeverAutoRemove
 +
 +  [ Sarah Hobbs ]
 +  * Change metapackages to *metapackages in Install-Recommends-Section
 +    and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
 +    the Recommends of metapackages in universe and multiverse will get
 +    installed.
 +  * Also make this change in doc/examples/configure-index.
 +  * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
 +    docbook to fix FTBFS.
 +  * Added in previous changelog entries, as those who uploaded did not
 +    actually commit to Bzr.
 +
 + -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 09 Jul 2007 01:15:57 +1000
 +
 +apt (0.7.2ubuntu5) gutsy; urgency=low
 +
 +  * Rerun autoconf to fix the FTBFS.
 +
 + -- Michael Bienia <geser@ubuntu.com>  Fri, 06 Jul 2007 19:17:33 +0200
 +
 +apt (0.7.2ubuntu4) gutsy; urgency=low
 +
 +  * Rebuild for the libcurl4 -> libcurl3 transition mess.
 +
 + -- Steve Kowalik <stevenk@ubuntu.com>  Fri,  6 Jul 2007 12:44:05 +1000
 +
 +apt (0.7.2ubuntu3) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix InstallTask code when a pkgRecord ends 
 +      with a single '\n' (thanks to Soren Hansen for reporting)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jun 2007 13:33:38 +0200
 +
 +apt (0.7.2ubuntu2) gutsy; urgency=low
 +
 +  * fixed compile errors with g++ 4.3 (thanks to 
 +    Daniel Burrows, closes: #429378)
 +  * fix FTFBFS by changing build-depends to
 +    libcurl4-gnutls-dev (closes: #428363)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Jun 2007 13:47:03 +0200
 +
 +apt (0.7.2ubuntu1) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - apport integration added, this means that a apport
 +      report is written on dpkg failures
 +  * cmdline/apt-get.cc:
 +    - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
 +      this will warn when Vcs- headers are found on apt-get source
 +      (Fixes LP:#115959)
 +  * merged from debian/unstable, remaining changes:
 +    - maintainer field changed
 +    - merged the apt--mirror branch 
 +      http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
 +    - apport reporting on package install/upgrade/remove failure
 +    - support for "Originial-Maintainer" field
 +    - merged apt--xs-vcs-bzr branch
 +      (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
 +    - use ubuntu archive keyring by default
 +    - debian/apt.conf.autoremove
 +      + install recommands for section "metapackages"
 +      + do not mark direct dependencies of "metapackages" as autoremoved
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 10:38:36 +0200
 +
  apt (0.7.2-0.1) unstable; urgency=low
  
    * Non-maintainer upload.
@@@ -4422,144 -2975,34 +4542,144 @@@ apt (0.7.1) experimental; urgency=lo
    * apt-pkg/policy.cc:
      - allow multiple packages (thanks to David Foerster)
  
 - -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 + -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 +
 +apt (0.7.0) experimental; urgency=low
 +
 +  * Package that contains all the new features
 +  * Removed all #pragma interface/implementation
 +  * Branch that contains all the new features:
 +  * translated package descriptions
 +  * task install support
 +  * automatic dependency removal (thanks to Daniel Burrows)
 +  * merged support for the new dpkg "Breaks" field 
 +    (thanks to Ian Jackson)
 +  * handle network failures more gracefully on "update"
 +  * support for unattended-upgrades (via unattended-upgrades
 +    package)
 +  * added apt-transport-https method
 +  * merged "install-recommends" branch (ABI break): 
 +    - new "--install-recommends"
 +    - install new recommends on "upgrade" if --install-recommends is 
 +      given
 +    - new "--fix-policy" option to install all packages with unmet
 +      important dependencies (usefull with --install-recommends to
 +      see what not-installed recommends are on the system)
 +    - fix of recommended packages display (only show CandidateVersion
 +      fix or-group handling)
 +  * merged "install-task" branch (use with "apt-get install taskname^")
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 +
 +apt (0.6.46.4ubuntu10) feisty; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - added "APT::Never-MarkAuto-Section" and consider dependencies 
 +      of packages in this section manual (LP#59893)
 +    - ensure proper permissions in the extended_state file (LP#67037)
 +  * debian/apt.conf.ubuntu:
 +    - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
 +  * cmdline/apt-get.cc:
 +    - "apt-get install foo" on a already installed package foo will
 +      clean the automatic installed flag (LP#72007)
 +    - do not show packages already marked for removal as auto-installed
 +      (LP#64493)
 +    - applied patch to (optionally) hide the auto-remove information
 +      (thanks to Frode M. Døving) (LP#69148)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100
 +
 +apt (0.6.46.4ubuntu9) feisty; urgency=low
 +
 +  * debian/control:
 +    - set XS-Vcs-Bzr header
 +    - Set Ubuntu maintainer address
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +    - only umount if it was mounted by the method before
 +  * cmdline/apt-get.cc:
 +    - fix version output in autoremove list (LP#68941)
 +  * apt-pkg/packagemanager.cc:
 +    - do not spin 100% cpu in FixMissing() (LP#84476)
 +  * apt-pkg/indexfile.cc:
 +    - fix problem overwriting APT::Acquire::Translation
 +  * doc/examples/configure-index:
 +    - document APT::Acquire::Translation
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 15:24:39 +0100
 +
 +apt (0.6.46.4ubuntu8) feisty; urgency=low
 +
 +  * fix segfault in the pkgRecords destructor
 +  * Bump ABI version
 +  * debian/control:
 +    - make the libcurl3-gnutls-dev versionized (LP#86614)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:26:33 +0100
 +
 +apt (0.6.46.4ubuntu7) feisty; urgency=low
 +
 +  * Merged the apt--mirror branch. This means that a new 'mirror' 
 +    method is available that will allow dynamic mirror updates.
 +    The sources.list entry looks something like this:
 +    "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
 +
 +    It also supports error reporting to a configurable url for mirror
 +    problems/failures.
 +  * Bump ABI version
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:38:06 +0100
 +
 +apt (0.6.46.4ubuntu6) feisty; urgency=low
 +
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/algorithms.cc:
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +    - fix segfault (lp: #76530)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
 +
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
 +
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
  
 -apt (0.7.0) experimental; urgency=low
 +apt (0.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
  
 -  * Package that contains all the new features
 -  * Removed all #pragma interface/implementation
 -  * Branch that contains all the new features:
 -  * translated package descriptions
 -  * task install support
 -  * automatic dependency removal (thanks to Daniel Burrows)
 -  * merged support for the new dpkg "Breaks" field 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 +
 +apt (0.6.46.4ubuntu3) feisty; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - use clog for all debugging
 +  * apt-pkg/depcache.cc:
 +    - never mark Required package for autoremoval (lp: #75882)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
 +
 +apt (0.6.46.4ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
      (thanks to Ian Jackson)
 -  * handle network failures more gracefully on "update"
 -  * support for unattended-upgrades (via unattended-upgrades
 -    package)
 -  * added apt-transport-https method
 -  * merged "install-recommends" branch (ABI break): 
 -    - new "--install-recommends"
 -    - install new recommends on "upgrade" if --install-recommends is 
 -      given
 -    - new "--fix-policy" option to install all packages with unmet
 -      important dependencies (usefull with --install-recommends to
 -      see what not-installed recommends are on the system)
 -    - fix of recommended packages display (only show CandidateVersion
 -      fix or-group handling)
 -  * merged "install-task" branch (use with "apt-get install taskname^")
  
 - -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 23:07:24 +0100
 +
 +apt (0.6.46.4ubuntu1) feisty; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
  
  apt (0.6.46.4-0.1) unstable; urgency=emergency
    
@@@ -4590,26 -3033,6 +4710,26 @@@ apt (0.6.46.4) unstable; urgency=hig
  
   -- Michael Vogt <mvo@debian.org>  Thu,  7 Dec 2006 10:49:50 +0100
  
 +apt (0.6.46.3ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Thu,  7 Dec 2006 15:46:52 +0000
 +
 +apt (0.6.46.3ubuntu1) feisty; urgency=low
 +
 +  * doc/apt-get.8.xml:
 +    - documented autoremove, thanks to Vladimír Lapá\e%GÄ\8d\e%@ek 
 +      (lp: #62919)
 +  * fix broken i18n in the dpkg progress reporting, thanks to 
 +    Frans Pop and Steinar Gunderson. (closes: #389261)
 +  * po/en_GB.po:
 +    - typo (lp: #61270)
 +  * add apt-secure.8 to "See also" section
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 23 Nov 2006 07:24:12 +0100
 +
  apt (0.6.46.3-0.2) unstable; urgency=high
  
    * Non-maintainer upload with permission of Michael Vogt.
@@@ -4722,173 -3145,6 +4842,173 @@@ apt (0.6.46) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Thu, 21 Sep 2006 10:25:03 +0200
  
 +apt (0.6.45ubuntu14) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the TryInstallTask() code to make sure that all package
 +      there are marked manual install (lp: #61684)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Sep 2006 00:34:20 +0200
 +
 +apt (0.6.45ubuntu13) edgy; urgency=low
 +
 +  * no-changes upload to make apt rebuild against latest g++ and
 +    fix synaptic FTBFS (see bug: #62461 for details)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Sep 2006 22:33:10 +0200
 +
 +apt (0.6.45ubuntu12) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix in the sweep() code, set garbage flag for packages scheduled 
 +      for removal too
 +    - do not change the autoFlag in MarkKeep(), this can lead to suprising
 +      side effects
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Sep 2006 00:58:24 +0200
 +
 +apt (0.6.45ubuntu11) edgy; urgency=low
 +
 +  * removed "installtask" and change it so that tasknames can be given
 +    with "apt-get install taskname^"
 +  * improve the writeStateFile() code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Sep 2006 14:14:24 +0200
 +
 +apt (0.6.45ubuntu10) edgy; urgency=low
 +
 +  * methods/http.cc:
 +    - check more careful for incorrect proxy settings (closes: #378868)
 +  * methods/gzip.cc:
 +    - don't hang when /var is full (closes: #341537), thanks to
 +      Luis Rodrigo Gallardo Cruz for the patch
 +  * doc/examples/sources.list:
 +    - removed non-us.debian.org from the example (closes: #380030,#316196)
 +  * Merged from Christian Perrier bzr branch:
 +    * ro.po: Updated to 514t. Closes: #388402
 +    * dz.po: Updated to 514t. Closes: #388184
 +    * it.po: Fixed typos. Closes: #387812
 +    * ku.po: New kurdish translation. Closes: #387766
 +    * sk.po: Updated to 514t. Closes: #386851
 +    * ja.po: Updated to 514t. Closes: #386537
 +    * gl.po: Updated to 514t. Closes: #386397
 +    * fr.po: Updated to 516t.
 +    * fi.po: Updated to 512t. Closes: #382702
 +  * share/archive-archive.gpg:
 +    - removed the outdated amd64 and debian-2004 keys
 +  * apt-pkg/tagfile.cc:
 +    - applied patch from Jeroen van Wolffelaar to make the tags
 +      caseinsensitive (closes: #384182)
 +    - reverted MMap use in the tagfile because it does not work 
 +      across pipes (closes: #383487) 
 +  * added "installtask" command
 +  * added new ubuntu specific rewrite rule for "Original-Maintainer"
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Sep 2006 15:07:51 +0200
 +
 +apt (0.6.45ubuntu9) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - if --no-remove is given, do not run the AutoRemove code 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Sep 2006 11:54:20 +0200
 +
 +apt (0.6.45ubuntu8) edgy; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
 +      information (lp: #59457)
 +  * cmdline/apt-get.cc:
 +    - fix typo in autoremove information (lp: #59420)
 +  * install apt-mark to modify the automatically install information for
 +    packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 20:07:22 +0200
 +
 +apt (0.6.45ubuntu7) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix a bug in the install-recommends-section code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 18:22:38 +0200
 +
 +apt (0.6.45ubuntu6) edgy; urgency=low
 +
 +  [Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - always show auto-removable packages and give a hint how to remove 
 +      them
 +  * debian/apt.conf.ubuntu:
 +    - exlucde linux-image and linux-restricted-modules from ever being 
 +      auto-removed
 +    - added "metapackages" as the section we want to install recommends
 +      by default
 +  * apt-pkg/depcache.cc:
 +    - added support to turn install-recommends selectively on/off by
 +      section
 +  [Ian Jackson]
 +  * Tests pass without code changes!  Except that we need this:
 +  * Bump cache file major version to force rebuild so that Breaks
 +    dependencies are included.
 +  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
 +    --auto-deconfigure is very very old and dpkg-dev's Breaks support
 +    is more or less orthogonal.
 +  * Initial draft of `Breaks' implementation.  Appears to compile,
 +    but as yet *completely untested*.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 11:50:52 +0200
 +
 +apt (0.6.45ubuntu5) edgy; urgency=low
 +
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase the APT::Cache-Limit to deal with the increased demand due
 +      to the translated descriptions
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - pass "--auto-deconfigure" to dpkg on install to support the
 +      new "breaks" in dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 +
 +apt (0.6.45ubuntu4) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the new --fix-polciy code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 21:08:11 +0200
 +
 +apt (0.6.45ubuntu3) edgy; urgency=low
 +
 +  * ABI break
 +  * merged latest apt--install-recommends (closes: #559000)
 +  * 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)
 +  * merged the apt--ddtp branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Aug 2006 12:53:23 +0200
 +
 +apt (0.6.45ubuntu2) edgy; urgency=low
 +
 +  * debian/control:
 +    - switched to libdb4.4 for building (closes: #381019)
 +  * cmdline/apt-get.cc:
 +    - show only the recommends/suggests for the candidate-version, not for all
 +      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 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
  
    * apt-pkg/contrib/sha256.cc:
@@@ -4934,37 -3190,6 +5054,37 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
  
 +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.2exp1) experimental; urgency=low
  
    * added support for i18n of the package descriptions
@@@ -5053,26 -3278,6 +5173,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:
@@@ -5105,38 -3310,6 +5225,38 @@@
  
   -- 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)
 +  * 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 <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
 +
  apt (0.6.43.2) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@@ -5160,24 -3333,6 +5280,24 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
 +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:
@@@ -5201,19 -3356,6 +5321,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:  
@@@ -5234,22 -3376,6 +5354,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:
@@@ -5356,80 -3482,6 +5476,80 @@@ apt (0.6.41) unstable; urgency=lo
    
   -- 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
  
    * bugfix in the parsing code for the apt<->dpkg communication. apt 
@@@ -5439,12 -3491,6 +5559,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
@@@ -5460,39 -3506,6 +5580,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
@@@ -5505,13 -3518,6 +5625,13 @@@
  
   -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -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
  
    * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround

diff --combined debian/rules
index d8e4a88bdaad4f19f10cf1082deb4a27c6db5b94,0544b2b8e1c92cdea83e2715c28c7ed2c61a929d..93fdbd8da2d48a12b05a88594fba86c62685d9fe
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,9 -3,6 +3,9 @@@
  # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
  # Some lines taken from debmake, by Christoph Lameter.
  
 +# build in verbose mode by default to make it easy to diangose issues
 +export NOISY=1
 +
  export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  
@@@ -123,6 -120,9 +123,9 @@@ libapt-pkg-doc: build-do
  #
  # libapt-pkg-doc install
  #
+       # remove doxygen's embedded jquery as we don't use it anyway (#622147)
+       rm -f $(BLD)/doc/doxygen/html/jquery.js
+ 
        dh_installdocs -p$@ $(BLD)/docs/design* \
                            $(BLD)/docs/dpkg-tech* \
                            $(BLD)/docs/files* \
@@@ -176,8 -176,6 +179,8 @@@ apt: build build-do
  # apt install
  #
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 +      cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog
 +      cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
  
        # make rosetta happy and remove pot files in po/ (but leave stuff
        # in po/domains/* untouched) and cp *.po into each domain dir

diff --combined po/apt-all.pot
index ee139b2e7533e2f0b6430200f88ec0d07a6ae8af,73ed82195db229fe1f836a6e711d8990b5e3a464..00291f5683d380d5757a2525a37cb64146c3ab83
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2011-01-12 17:42+0100\n"
 +"POT-Creation-Date: 2011-04-05 10:32+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -90,80 -90,82 +90,80 @@@ msgstr "
  msgid "Total space accounted for: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 +#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1273
 -msgid "You must give at least one search pattern"
 +#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
 +#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
 +msgid "No packages found"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 -#: cmdline/apt-cache.cc:1508
 -msgid "No packages found"
 +#: cmdline/apt-cache.cc:1221
 +msgid "You must give at least one search pattern"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
 +#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1533
 +#: cmdline/apt-cache.cc:1481
  msgid "Package files:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 +#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1579
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
  #. Show any packages have explicit pins
 -#: cmdline/apt-cache.cc:1554
 +#: cmdline/apt-cache.cc:1502
  msgid "Pinned packages:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 +#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1559
  msgid "(not found)"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1575
 +#: cmdline/apt-cache.cc:1522
  msgid "  Installed: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1576
 +#: cmdline/apt-cache.cc:1523
  msgid "  Candidate: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 +#: cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1549
  msgid "(none)"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1615
 +#: cmdline/apt-cache.cc:1556
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
 -#: cmdline/apt-cache.cc:1624
 +#: cmdline/apt-cache.cc:1565
  msgid "  Version table:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 +#: cmdline/apt-cache.cc:1678 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
 +#: cmdline/apt-get.cc:3106 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1745
 +#: cmdline/apt-cache.cc:1685
  msgid ""
  "Usage: apt-cache [options] command\n"
 -"       apt-cache [options] add file1 [file2 ...]\n"
  "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
  "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
  "\n"
 -"apt-cache is a low-level tool used to manipulate APT's binary\n"
 -"cache files, and query information from them\n"
 +"apt-cache is a low-level tool used to query information\n"
 +"from APT's binary cache files\n"
  "\n"
  "Commands:\n"
 -"   add - Add a package file to the source cache\n"
  "   gencaches - Build both the package and source cache\n"
  "   showpkg - Show some general information for a single package\n"
  "   showsrc - Show source records\n"
@@@ -248,7 -250,7 +248,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1148
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -367,92 -369,97 +367,92 @@@ msgstr "
  msgid "Unable to get a cursor"
  msgstr ""
  
 -#: ftparchive/writer.cc:73
 +#: ftparchive/writer.cc:78
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:83
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:139
  msgid "E: "
  msgstr ""
  
 -#: ftparchive/writer.cc:136
 +#: ftparchive/writer.cc:141
  msgid "W: "
  msgstr ""
  
 -#: ftparchive/writer.cc:143
 +#: ftparchive/writer.cc:148
  msgid "E: Errors apply to file "
  msgstr ""
  
 -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
 +#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:174
 +#: ftparchive/writer.cc:179
  msgid "Tree walking failed"
  msgstr ""
  
 -#: ftparchive/writer.cc:201
 +#: ftparchive/writer.cc:206
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:260
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:268
 +#: ftparchive/writer.cc:273
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:272
 +#: ftparchive/writer.cc:277
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:279
 +#: ftparchive/writer.cc:284
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:289
 +#: ftparchive/writer.cc:294
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:393
 +#: ftparchive/writer.cc:398
  msgid "Archive had no package field"
  msgstr ""
  
 -#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
 +#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
 +#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:698
 +#: ftparchive/writer.cc:713
  #, c-format
  msgid "  %s has no source override entry\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:702
 +#: ftparchive/writer.cc:717
  #, c-format
  msgid "  %s has no binary override entry either\n"
  msgstr ""
  
 -#: ftparchive/contents.cc:321
 -#, c-format
 -msgid "Internal error, could not locate member %s"
 -msgstr ""
 -
 -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
 +#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
  msgid "realloc - Failed to allocate memory"
  msgstr ""
  
@@@ -481,63 -488,63 +481,63 @@@ msgstr "
  msgid "Failed to read the override file %s"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:72
 +#: ftparchive/multicompress.cc:67
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:102
 +#: ftparchive/multicompress.cc:97
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
 +#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:195
 +#: ftparchive/multicompress.cc:191
  msgid "Failed to create FILE*"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:198
 +#: ftparchive/multicompress.cc:194
  msgid "Failed to fork"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:212
 +#: ftparchive/multicompress.cc:208
  msgid "Compress child"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:235
 +#: ftparchive/multicompress.cc:231
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:286
 +#: ftparchive/multicompress.cc:282
  msgid "Failed to create subprocess IPC"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:321
 +#: ftparchive/multicompress.cc:319
  msgid "Failed to exec compressor "
  msgstr ""
  
 -#: ftparchive/multicompress.cc:360
 +#: ftparchive/multicompress.cc:358
  msgid "decompressor"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:403
 +#: ftparchive/multicompress.cc:401
  msgid "IO to subprocess/file failed"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:455
 +#: ftparchive/multicompress.cc:453
  msgid "Failed to read while computing MD5"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:472
 +#: ftparchive/multicompress.cc:470
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
 -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
 +#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
@@@ -585,94 -592,94 +585,94 @@@ msgstr "
  msgid " or"
  msgstr ""
  
 -#: cmdline/apt-get.cc:392
 +#: cmdline/apt-get.cc:390
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:420
 +#: cmdline/apt-get.cc:416
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:442
 +#: cmdline/apt-get.cc:438
  msgid "The following packages have been kept back:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:465
 +#: cmdline/apt-get.cc:459
  msgid "The following packages will be upgraded:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:488
 +#: cmdline/apt-get.cc:480
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:508
 +#: cmdline/apt-get.cc:500
  msgid "The following held packages will be changed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:563
 +#: cmdline/apt-get.cc:555
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
 -#: cmdline/apt-get.cc:571
 +#: cmdline/apt-get.cc:563
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:605
 +#: cmdline/apt-get.cc:594
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:609
 +#: cmdline/apt-get.cc:598
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:611
 +#: cmdline/apt-get.cc:600
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:613
 +#: cmdline/apt-get.cc:602
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:617
 +#: cmdline/apt-get.cc:606
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:639
 +#: cmdline/apt-get.cc:628
  #, c-format
  msgid "Note, selecting '%s' for task '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:645
 +#: cmdline/apt-get.cc:634
  #, c-format
  msgid "Note, selecting '%s' for regex '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:662
 +#: cmdline/apt-get.cc:651
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:673
 +#: cmdline/apt-get.cc:662
  msgid " [Installed]"
  msgstr ""
  
 -#: cmdline/apt-get.cc:682
 +#: cmdline/apt-get.cc:671
  msgid " [Not candidate version]"
  msgstr ""
  
 -#: cmdline/apt-get.cc:684
 +#: cmdline/apt-get.cc:673
  msgid "You should explicitly select one to install."
  msgstr ""
  
 -#: cmdline/apt-get.cc:687
 +#: cmdline/apt-get.cc:676
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -680,177 -687,177 +680,177 @@@
  "is only available from another source\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:705
 +#: cmdline/apt-get.cc:694
  msgid "However the following packages replace it:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:717
 +#: cmdline/apt-get.cc:706
  #, c-format
  msgid "Package '%s' has no installation candidate"
  msgstr ""
  
 -#: cmdline/apt-get.cc:728
 +#: cmdline/apt-get.cc:717
  #, c-format
  msgid "Virtual packages like '%s' can't be removed\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:759
 +#: cmdline/apt-get.cc:748
  #, c-format
  msgid "Note, selecting '%s' instead of '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:789
 +#: cmdline/apt-get.cc:778
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:793
 +#: cmdline/apt-get.cc:782
  #, c-format
  msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:803
 +#: cmdline/apt-get.cc:794
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:808
 +#: cmdline/apt-get.cc:799
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080
  #, c-format
  msgid "%s set to manually installed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:853
 +#: cmdline/apt-get.cc:844
  #, c-format
  msgid "Selected version '%s' (%s) for '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:858
 +#: cmdline/apt-get.cc:849
  #, c-format
  msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:898
 +#: cmdline/apt-get.cc:893
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:973
 +#: cmdline/apt-get.cc:971
  msgid "Correcting dependencies..."
  msgstr ""
  
 -#: cmdline/apt-get.cc:976
 +#: cmdline/apt-get.cc:974
  msgid " failed."
  msgstr ""
  
 -#: cmdline/apt-get.cc:979
 +#: cmdline/apt-get.cc:977
  msgid "Unable to correct dependencies"
  msgstr ""
  
 -#: cmdline/apt-get.cc:982
 +#: cmdline/apt-get.cc:980
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
 -#: cmdline/apt-get.cc:984
 +#: cmdline/apt-get.cc:982
  msgid " Done"
  msgstr ""
  
 -#: cmdline/apt-get.cc:988
 +#: cmdline/apt-get.cc:986
  msgid "You might want to run 'apt-get -f install' to correct these."
  msgstr ""
  
 -#: cmdline/apt-get.cc:991
 +#: cmdline/apt-get.cc:989
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1016
 +#: cmdline/apt-get.cc:1014
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1020
 +#: cmdline/apt-get.cc:1018
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1027
 +#: cmdline/apt-get.cc:1025
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
 -#: cmdline/apt-get.cc:1029
 +#: cmdline/apt-get.cc:1027
  msgid "Some packages could not be authenticated"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
 +#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1079
 +#: cmdline/apt-get.cc:1077
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1088
 +#: cmdline/apt-get.cc:1086
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1099
 +#: cmdline/apt-get.cc:1097
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1137
 +#: cmdline/apt-get.cc:1135
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:1144
 +#: cmdline/apt-get.cc:1142
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:1149
 +#: cmdline/apt-get.cc:1147
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:1156
 +#: cmdline/apt-get.cc:1154
  #, c-format
  msgid "After this operation, %sB of additional disk space will be used.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:1161
 +#: cmdline/apt-get.cc:1159
  #, c-format
  msgid "After this operation, %sB disk space will be freed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
 -#: cmdline/apt-get.cc:2370
 +#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2484
 +#: cmdline/apt-get.cc:2487
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1189
 +#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
 +#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1207
 +#: cmdline/apt-get.cc:1205
  msgid "Yes, do as I say!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1209
 +#: cmdline/apt-get.cc:1207
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -858,46 -865,46 +858,46 @@@
  " ?] "
  msgstr ""
  
 -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
 +#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
  msgid "Abort."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1230
 +#: cmdline/apt-get.cc:1228
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
 -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
 +#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2544 apt-pkg/algorithms.cc:1427
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1320
 +#: cmdline/apt-get.cc:1318
  msgid "Some files failed to download"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
 +#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2553
  msgid "Download complete and in download only mode"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1327
 +#: cmdline/apt-get.cc:1325
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1331
 +#: cmdline/apt-get.cc:1329
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1336
 +#: cmdline/apt-get.cc:1334
  msgid "Unable to correct missing packages."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1337
 +#: cmdline/apt-get.cc:1335
  msgid "Aborting install."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1365
 +#: cmdline/apt-get.cc:1363
  msgid ""
  "The following package disappeared from your system as\n"
  "all files have been overwritten by other packages:"
@@@ -907,35 -914,35 +907,35 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
 -#: cmdline/apt-get.cc:1369
 +#: cmdline/apt-get.cc:1367
  msgid "Note: This is done automatic and on purpose by dpkg."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1499
 +#: cmdline/apt-get.cc:1497
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1531
 +#: cmdline/apt-get.cc:1529
  #, c-format
  msgid "Picking '%s' as source package instead of '%s'\n"
  msgstr ""
  
  #. if (VerTag.empty() == false && Last == 0)
 -#: cmdline/apt-get.cc:1569
 +#: cmdline/apt-get.cc:1567
  #, c-format
  msgid "Ignore unavailable version '%s' of package '%s'"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1585
 +#: cmdline/apt-get.cc:1583
  msgid "The update command takes no arguments"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1647
 +#: cmdline/apt-get.cc:1645
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1699
 +#: cmdline/apt-get.cc:1740
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
@@@ -951,15 -958,15 +951,15 @@@ msgstr "
  #. "that package should be filed.") << endl;
  #. }
  #.
 -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1706
 +#: cmdline/apt-get.cc:1747
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1713
 +#: cmdline/apt-get.cc:1754
  msgid ""
  "The following package was automatically installed and is no longer required:"
  msgid_plural ""
@@@ -968,7 -975,7 +968,7 @@@
  msgstr[0] ""
  msgstr[1] ""
  
 -#: cmdline/apt-get.cc:1717
 +#: cmdline/apt-get.cc:1758
  #, c-format
  msgid "%lu package was automatically installed and is no longer required.\n"
  msgid_plural ""
@@@ -976,25 -983,25 +976,25 @@@
  msgstr[0] ""
  msgstr[1] ""
  
 -#: cmdline/apt-get.cc:1719
 +#: cmdline/apt-get.cc:1760
  msgid "Use 'apt-get autoremove' to remove them."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1738
 +#: cmdline/apt-get.cc:1779
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1828
 +#: cmdline/apt-get.cc:1878
  msgid "You might want to run 'apt-get -f install' to correct these:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1831
 +#: cmdline/apt-get.cc:1882
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1843
 +#: cmdline/apt-get.cc:1898
  msgid ""
  "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"
@@@ -1002,74 -1009,69 +1002,74 @@@
  "or been moved out of Incoming."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1861
 +#: cmdline/apt-get.cc:1916
  msgid "Broken packages"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1889
 +#: cmdline/apt-get.cc:1942
  msgid "The following extra packages will be installed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1979
 +#: cmdline/apt-get.cc:2032
  msgid "Suggested packages:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1980
 +#: cmdline/apt-get.cc:2033
  msgid "Recommended packages:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2022
 +#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2029
 +#: cmdline/apt-get.cc:2082
  #, c-format
  msgid "%s set to automatically installed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2050
 +#: cmdline/apt-get.cc:2103
  msgid "Calculating upgrade... "
  msgstr ""
  
 -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
 +#: cmdline/apt-get.cc:2106 methods/ftp.cc:707 methods/connect.cc:111
  msgid "Failed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2058
 +#: cmdline/apt-get.cc:2111
  msgid "Done"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
 +#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2186
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
 +#: cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2243
  msgid "Unable to lock the download directory"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2233
 +#: cmdline/apt-get.cc:2294
 +#, c-format
 +msgid "Downloading %s %s"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:2350
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
 +#: cmdline/apt-get.cc:2390 cmdline/apt-get.cc:2671
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2289
 +#: cmdline/apt-get.cc:2406
  #, c-format
  msgid ""
  "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
  "%s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2294
 +#: cmdline/apt-get.cc:2411
  #, c-format
  msgid ""
  "Please use:\n"
@@@ -1077,120 -1079,115 +1077,120 @@@
  "to retrieve the latest (possibly unreleased) updates to the package.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2345
 +#: cmdline/apt-get.cc:2462
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2380
 +#: cmdline/apt-get.cc:2497
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:2388
 +#: cmdline/apt-get.cc:2505
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 -#: cmdline/apt-get.cc:2393
 +#: cmdline/apt-get.cc:2510
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2399
 +#: cmdline/apt-get.cc:2516
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2432
 +#: cmdline/apt-get.cc:2549
  msgid "Failed to fetch some archives."
  msgstr ""
  
 -#: cmdline/apt-get.cc:2462
 +#: cmdline/apt-get.cc:2579
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2474
 +#: cmdline/apt-get.cc:2591
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2475
 +#: cmdline/apt-get.cc:2592
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2492
 +#: cmdline/apt-get.cc:2609
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2512
 +#: cmdline/apt-get.cc:2629
  msgid "Child process failed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2528
 +#: cmdline/apt-get.cc:2645
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2559
 +#: cmdline/apt-get.cc:2676
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2579
 +#: cmdline/apt-get.cc:2696
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2630
 +#: cmdline/apt-get.cc:2747
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2683
 +#: cmdline/apt-get.cc:2800
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2719
 +#: cmdline/apt-get.cc:2836
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2746
 +#: cmdline/apt-get.cc:2863
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2762
 +#: cmdline/apt-get.cc:2879
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
 -#: cmdline/apt-get.cc:2767
 +#: cmdline/apt-get.cc:2884
  msgid "Failed to process build dependencies"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2798
 +#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989
 +#, c-format
 +msgid "Changelog for %s (%s)"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:3111
  msgid "Supported modules:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2839
 +#: cmdline/apt-get.cc:3152
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1216,8 -1213,6 +1216,8 @@@
  "   check - Verify that there are no broken dependencies\n"
  "   markauto - Mark the given packages as automatically installed\n"
  "   unmarkauto - Mark the given packages as manually installed\n"
 +"   changelog - Download and display the changelog for the given package\n"
 +"   download - Download the binary package into the current directory\n"
  "\n"
  "Options:\n"
  "  -h  This help text.\n"
@@@ -1238,7 -1233,7 +1238,7 @@@
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2995
 +#: cmdline/apt-get.cc:3316
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1340,7 -1335,7 +1340,7 @@@ msgstr "
  msgid "Failed to exec gzip "
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
  msgid "Corrupted archive"
  msgstr ""
  
@@@ -1348,7 -1343,7 +1348,7 @@@
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:296
 +#: apt-inst/contrib/extracttar.cc:300
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
@@@ -1456,28 -1451,28 +1456,28 @@@ msgstr "
  msgid "The path is too long"
  msgstr ""
  
 -#: apt-inst/extract.cc:414
 +#: apt-inst/extract.cc:412
  #, c-format
  msgid "Overwrite package match with no version for %s"
  msgstr ""
  
 -#: apt-inst/extract.cc:431
 +#: apt-inst/extract.cc:429
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
  #. Only warn if there are no sources.list.d.
  #. Only warn if there is no sources.list file.
 -#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
 -#: methods/mirror.cc:87
 +#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:180
 +#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:106
 +#: apt-pkg/init.cc:114 apt-pkg/clean.cc:33 apt-pkg/policy.cc:302
 +#: methods/mirror.cc:91
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
  
 -#: apt-inst/extract.cc:491
 +#: apt-inst/extract.cc:489
  #, c-format
  msgid "Unable to stat %s"
  msgstr ""
@@@ -1501,9 -1496,9 +1501,9 @@@ msgstr "
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
 -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
 -#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
 -#: apt-pkg/pkgcachegen.cc:1326
 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1047
 +#: apt-pkg/pkgcachegen.cc:1151 apt-pkg/pkgcachegen.cc:1157
 +#: apt-pkg/pkgcachegen.cc:1303
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1576,57 -1571,51 +1576,57 @@@ msgstr "
  msgid "Error parsing MD5. Offset %lu"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
 +#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:50
 +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 +#: apt-inst/deb/debfile.cc:53
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:110
 +#: apt-inst/deb/debfile.cc:113
  #, c-format
  msgid "Couldn't change to %s"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:140
 -msgid "Internal error, could not locate member"
 +#: apt-inst/deb/debfile.cc:154
 +#, c-format
 +msgid "Internal error, could not locate member %s"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:173
 +#: apt-inst/deb/debfile.cc:189
  msgid "Failed to locate a valid control file"
  msgstr ""
  
 -#: apt-inst/deb/debfile.cc:258
 +#: apt-inst/deb/debfile.cc:274
  msgid "Unparsable control file"
  msgstr ""
  
 -#: methods/bzip2.cc:65
 +#: methods/bzip2.cc:60 methods/gzip.cc:52
 +msgid "Empty files can't be valid archives"
 +msgstr ""
 +
 +#: methods/bzip2.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
 -#: methods/bzip2.cc:109
 +#: methods/bzip2.cc:108
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
 -#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
 -#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
 -#: methods/rred.cc:495
 +#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
 +#: methods/rred.cc:533
  msgid "Failed to stat"
  msgstr ""
  
 -#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
 -#: methods/rred.cc:492
 +#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
 +#: methods/rred.cc:530
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1654,7 -1643,7 +1654,7 @@@ msgstr "
  msgid "Disk not found."
  msgstr ""
  
 -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
  msgid "File not found"
  msgstr ""
  
@@@ -1706,7 -1695,7 +1706,7 @@@ msgstr "
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
 -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
  msgid "Connection timeout"
  msgstr ""
  
@@@ -1714,11 -1703,11 +1714,11 @@@
  msgid "Server closed the connection"
  msgstr ""
  
 -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
  msgid "Read error"
  msgstr ""
  
 -#: methods/ftp.cc:351 methods/rsh.cc:197
 +#: methods/ftp.cc:351 methods/rsh.cc:198
  msgid "A response overflowed the buffer."
  msgstr ""
  
@@@ -1726,7 -1715,7 +1726,7 @@@
  msgid "Protocol corruption"
  msgstr ""
  
 -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
  msgid "Write error"
  msgstr ""
  
@@@ -1780,7 -1769,7 +1780,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
 -#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
 +#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1789,7 -1778,7 +1789,7 @@@
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
 -#: methods/ftp.cc:897 methods/rsh.cc:321
 +#: methods/ftp.cc:897 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr ""
  
@@@ -1839,7 -1828,7 +1839,7 @@@ msgstr "
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
 -#: methods/connect.cc:149 methods/rsh.cc:424
 +#: methods/connect.cc:149 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
@@@ -1958,7 -1947,7 +1958,7 @@@ msgstr "
  msgid "Error reading from server"
  msgstr ""
  
 -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
 +#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
  msgid "Failed to truncate file"
  msgstr ""
  
@@@ -1996,21 -1985,21 +1996,21 @@@ msgstr "
  msgid "Unable to synchronize mmap"
  msgstr ""
  
 -#: apt-pkg/contrib/mmap.cc:300
 +#: apt-pkg/contrib/mmap.cc:302
  #, c-format
  msgid ""
  "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
  "Current value: %lu. (man 5 apt.conf)"
  msgstr ""
  
 -#: apt-pkg/contrib/mmap.cc:399
 +#: apt-pkg/contrib/mmap.cc:401
  #, c-format
  msgid ""
  "Unable to increase the size of the MMap as the limit of %lu bytes is already "
  "reached."
  msgstr ""
  
 -#: apt-pkg/contrib/mmap.cc:402
 +#: apt-pkg/contrib/mmap.cc:404
  msgid ""
  "Unable to increase size of the MMap as automatic growing is disabled by user."
  msgstr ""
@@@ -2039,7 -2028,7 +2039,7 @@@ msgstr "
  msgid "%lis"
  msgstr ""
  
 -#: apt-pkg/contrib/strutl.cc:1119
 +#: apt-pkg/contrib/strutl.cc:1138
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -2155,129 -2144,113 +2155,129 @@@ msgstr "
  msgid "Invalid operation %s"
  msgstr ""
  
 -#: apt-pkg/contrib/cdromutl.cc:52
 +#: apt-pkg/contrib/cdromutl.cc:53
  #, c-format
  msgid "Unable to stat the mount point %s"
  msgstr ""
  
 -#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
 +#: apt-pkg/contrib/cdromutl.cc:176 apt-pkg/contrib/cdromutl.cc:210
  #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
 -#: methods/mirror.cc:93
 +#: methods/mirror.cc:97
  #, c-format
  msgid "Unable to change to %s"
  msgstr ""
  
 -#: apt-pkg/contrib/cdromutl.cc:217
 +#: apt-pkg/contrib/cdromutl.cc:218
  msgid "Failed to stat the cdrom"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:154
 +#: apt-pkg/contrib/fileutl.cc:168
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:159
 +#: apt-pkg/contrib/fileutl.cc:173
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:177
 +#: apt-pkg/contrib/fileutl.cc:191
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:181
 +#: apt-pkg/contrib/fileutl.cc:195
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:321
 +#: apt-pkg/contrib/fileutl.cc:335
  #, c-format
  msgid "List of files can't be created as '%s' is not a directory"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:661
 +#: apt-pkg/contrib/fileutl.cc:362
 +#, c-format
 +msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 +msgstr ""
 +
 +#: apt-pkg/contrib/fileutl.cc:380
 +#, c-format
 +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 +msgstr ""
 +
 +#: apt-pkg/contrib/fileutl.cc:389
 +#, c-format
 +msgid ""
 +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 +msgstr ""
 +
 +#: apt-pkg/contrib/fileutl.cc:679
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:673
 +#: apt-pkg/contrib/fileutl.cc:691
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:675
 +#: apt-pkg/contrib/fileutl.cc:693
  #, c-format
  msgid "Sub-process %s received signal %u."
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:679
 +#: apt-pkg/contrib/fileutl.cc:697
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:681
 +#: apt-pkg/contrib/fileutl.cc:699
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:746
 +#: apt-pkg/contrib/fileutl.cc:764
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:763
 +#: apt-pkg/contrib/fileutl.cc:781
  #, c-format
  msgid "Could not open file descriptor %d"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:823
 +#: apt-pkg/contrib/fileutl.cc:841
  #, c-format
  msgid "read, still have %lu to read but none left"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:856
 +#: apt-pkg/contrib/fileutl.cc:874
  #, c-format
  msgid "write, still have %lu to write but couldn't"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:985
 +#: apt-pkg/contrib/fileutl.cc:1010
  #, c-format
  msgid "Problem closing the gzip file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:988
 +#: apt-pkg/contrib/fileutl.cc:1013
  #, c-format
  msgid "Problem closing the file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:993
 +#: apt-pkg/contrib/fileutl.cc:1018
  #, c-format
  msgid "Problem renaming the file %s to %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:1004
 +#: apt-pkg/contrib/fileutl.cc:1029
  #, c-format
  msgid "Problem unlinking the file %s"
  msgstr ""
  
 -#: apt-pkg/contrib/fileutl.cc:1017
 +#: apt-pkg/contrib/fileutl.cc:1042
  msgid "Problem syncing the file"
  msgstr ""
  
@@@ -2384,6 -2357,11 +2384,6 @@@ msgstr "
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
  
 -#: apt-pkg/depcache.cc:922
 -#, c-format
 -msgid "Internal error, group '%s' has no installable pseudo package"
 -msgstr ""
 -
  #: apt-pkg/tagfile.cc:102
  #, c-format
  msgid "Unable to parse package file %s (1)"
@@@ -2464,14 -2442,14 +2464,14 @@@ msgstr "
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
 -#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 +#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593
  #, c-format
  msgid ""
  "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
  "under APT::Immediate-Configure for details. (%d)"
  msgstr ""
  
 -#: apt-pkg/packagemanager.cc:452
 +#: apt-pkg/packagemanager.cc:445
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2479,7 -2457,7 +2479,7 @@@
  "you really want to do it, activate the APT::Force-LoopBreak option."
  msgstr ""
  
 -#: apt-pkg/packagemanager.cc:495
 +#: apt-pkg/packagemanager.cc:485
  #, c-format
  msgid ""
  "Could not perform immediate configuration on already unpacked '%s'. Please "
@@@ -2491,25 -2469,25 +2491,25 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:292
 +#: apt-pkg/algorithms.cc:249
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:1218
 +#: apt-pkg/algorithms.cc:1175
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:1220
 +#: apt-pkg/algorithms.cc:1177
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
 +#: apt-pkg/algorithms.cc:1453 apt-pkg/algorithms.cc:1455
  msgid ""
 -"Some index files failed to download, they have been ignored, or old ones "
 +"Some index files failed to download. They have been ignored, or old ones "
  "used instead."
  msgstr ""
  
@@@ -2550,17 -2528,17 +2550,17 @@@ msgstr "
  msgid "Method %s did not start correctly"
  msgstr ""
  
 -#: apt-pkg/acquire-worker.cc:413
 +#: apt-pkg/acquire-worker.cc:424
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
 -#: apt-pkg/init.cc:143
 +#: apt-pkg/init.cc:149
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
 -#: apt-pkg/init.cc:159
 +#: apt-pkg/init.cc:165
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2585,17 -2563,17 +2585,17 @@@ msgstr "
  msgid "The list of sources could not be read."
  msgstr ""
  
 -#: apt-pkg/policy.cc:344
 +#: apt-pkg/policy.cc:339
  #, c-format
  msgid "Invalid record in the preferences file %s, no Package header"
  msgstr ""
  
 -#: apt-pkg/policy.cc:366
 +#: apt-pkg/policy.cc:361
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
 -#: apt-pkg/policy.cc:374
 +#: apt-pkg/policy.cc:369
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
@@@ -2603,167 -2581,155 +2603,167 @@@
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:198
 +#: apt-pkg/pkgcachegen.cc:187
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:215
 +#: apt-pkg/pkgcachegen.cc:204
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:253
 +#: apt-pkg/pkgcachegen.cc:242
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:285
 +#: apt-pkg/pkgcachegen.cc:274
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:289
 +#: apt-pkg/pkgcachegen.cc:278
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 -#: apt-pkg/pkgcachegen.cc:324
 +#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
 +#: apt-pkg/pkgcachegen.cc:313
  #, c-format
  msgid "Error occurred while processing %s (NewVersion%d)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:320
 +#: apt-pkg/pkgcachegen.cc:309
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:353
 +#: apt-pkg/pkgcachegen.cc:342
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc2)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:360
 +#: apt-pkg/pkgcachegen.cc:348
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:363
 +#: apt-pkg/pkgcachegen.cc:351
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:366
 +#: apt-pkg/pkgcachegen.cc:354
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:369
 +#: apt-pkg/pkgcachegen.cc:357
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:398
 +#: apt-pkg/pkgcachegen.cc:386
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:412
 +#: apt-pkg/pkgcachegen.cc:400
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:418
 +#: apt-pkg/pkgcachegen.cc:406
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:982
 +#: apt-pkg/pkgcachegen.cc:959
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:1087
 +#: apt-pkg/pkgcachegen.cc:1064
  msgid "Collecting File Provides"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 +#: apt-pkg/pkgcachegen.cc:1242 apt-pkg/pkgcachegen.cc:1249
  msgid "IO Error saving source cache"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:136
 +#: apt-pkg/acquire-item.cc:135
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:484
 +#: apt-pkg/acquire-item.cc:628
  msgid "MD5Sum mismatch"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
 -#: apt-pkg/acquire-item.cc:1717
 +#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778
 +#: apt-pkg/acquire-item.cc:1921
  msgid "Hash Sum mismatch"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1244
 +#: apt-pkg/acquire-item.cc:1346
 +#, c-format
 +msgid ""
 +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 +"or malformed file)"
 +msgstr ""
 +
 +#: apt-pkg/acquire-item.cc:1361
 +#, c-format
 +msgid "Unable to find hash sum for '%s' in Release file"
 +msgstr ""
 +
 +#: apt-pkg/acquire-item.cc:1397
  msgid "There is no public key available for the following key IDs:\n"
  msgstr ""
  
  #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
  #. the time since then the file is invalid - formated in the same way as in
  #. the download progress display (e.g. 7d 3h 42min 1s)
 -#: apt-pkg/acquire-item.cc:1281
 +#: apt-pkg/acquire-item.cc:1434
  #, c-format
  msgid "Release file expired, ignoring %s (invalid since %s)"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1302
 +#: apt-pkg/acquire-item.cc:1455
  #, c-format
  msgid "Conflicting distribution: %s (expected %s but got %s)"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1328
 +#: apt-pkg/acquire-item.cc:1488
  #, c-format
  msgid ""
  "A error occurred during the signature verification. The repository is not "
  "updated and the previous index files will be used. GPG error: %s: %s\n"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1337
 +#: apt-pkg/acquire-item.cc:1497
  #, c-format
  msgid "GPG error: %s: %s"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1365
 +#: apt-pkg/acquire-item.cc:1569
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1424
 +#: apt-pkg/acquire-item.cc:1628
  #, c-format
  msgid ""
- "I wasn't able to locate file for the %s package. This might mean you need to "
- "manually fix this package."
+ "I wasn't able to locate a file for the %s package. This might mean you need "
+ "to manually fix this package."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1479
 +#: apt-pkg/acquire-item.cc:1683
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:1566
 +#: apt-pkg/acquire-item.cc:1770
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2772,27 -2738,27 +2772,27 @@@
  msgid "Unable to parse Release file %s"
  msgstr ""
  
 -#: apt-pkg/indexrecords.cc:60
 +#: apt-pkg/indexrecords.cc:63
  #, c-format
  msgid "No sections in Release file %s"
  msgstr ""
  
 -#: apt-pkg/indexrecords.cc:94
 +#: apt-pkg/indexrecords.cc:97
  #, c-format
  msgid "No Hash entry in Release file %s"
  msgstr ""
  
 -#: apt-pkg/indexrecords.cc:107
 +#: apt-pkg/indexrecords.cc:110
  #, c-format
  msgid "Invalid 'Valid-Until' entry in Release file %s"
  msgstr ""
  
 -#: apt-pkg/indexrecords.cc:122
 +#: apt-pkg/indexrecords.cc:125
  #, c-format
  msgid "Invalid 'Date' entry in Release file %s"
  msgstr ""
  
 -#: apt-pkg/vendorlist.cc:66
 +#: apt-pkg/vendorlist.cc:71
  #, c-format
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
@@@ -2880,22 -2846,22 +2880,22 @@@ msgstr "
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2967,12 -2933,12 +2967,12 @@@ msgstr "
  msgid "Installing %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828
  #, c-format
  msgid "Configuring %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835
  #, c-format
  msgid "Removing %s"
  msgstr ""
@@@ -2993,99 -2959,92 +2993,99 @@@ msgid "Running post-installation trigge
  msgstr ""
  
  #. FIXME: use a better string after freeze
 -#: apt-pkg/deb/dpkgpm.cc:646
 +#: apt-pkg/deb/dpkgpm.cc:651
  #, c-format
  msgid "Directory '%s' missing"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
 +#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680
  #, c-format
  msgid "Could not open file '%s'"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:816
 +#: apt-pkg/deb/dpkgpm.cc:821
  #, c-format
  msgid "Preparing %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:817
 +#: apt-pkg/deb/dpkgpm.cc:822
  #, c-format
  msgid "Unpacking %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:822
 +#: apt-pkg/deb/dpkgpm.cc:827
  #, c-format
  msgid "Preparing to configure %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:824
 +#: apt-pkg/deb/dpkgpm.cc:829
  #, c-format
  msgid "Installed %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:829
 +#: apt-pkg/deb/dpkgpm.cc:834
  #, c-format
  msgid "Preparing for removal of %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:831
 +#: apt-pkg/deb/dpkgpm.cc:836
  #, c-format
  msgid "Removed %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:836
 +#: apt-pkg/deb/dpkgpm.cc:841
  #, c-format
  msgid "Preparing to completely remove %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:837
 +#: apt-pkg/deb/dpkgpm.cc:842
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1043
 +#: apt-pkg/deb/dpkgpm.cc:1062
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1074
 +#: apt-pkg/deb/dpkgpm.cc:1093
  msgid "Running dpkg"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1277
 +#: apt-pkg/deb/dpkgpm.cc:1301
  msgid "No apport report written because MaxReports is reached already"
  msgstr ""
  
  #. check if its not a follow up error
 -#: apt-pkg/deb/dpkgpm.cc:1282
 +#: apt-pkg/deb/dpkgpm.cc:1306
  msgid "dependency problems - leaving unconfigured"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1284
 +#: apt-pkg/deb/dpkgpm.cc:1308
  msgid ""
  "No apport report written because the error message indicates its a followup "
  "error from a previous failure."
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1290
 +#: apt-pkg/deb/dpkgpm.cc:1314
  msgid ""
  "No apport report written because the error message indicates a disk full "
  "error"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1296
 +#: apt-pkg/deb/dpkgpm.cc:1321
  msgid ""
  "No apport report written because the error message indicates a out of memory "
  "error"
  msgstr ""
  
 -#: apt-pkg/deb/dpkgpm.cc:1303
 +#. do not report dpkg I/O errors, this is a format string, so we compare
 +#. the prefix and the suffix of the error with the dpkg error message
 +#: apt-pkg/deb/dpkgpm.cc:1327
 +#, c-format
 +msgid "short read in buffer_copy %s"
 +msgstr ""
 +
 +#: apt-pkg/deb/dpkgpm.cc:1337
  msgid ""
  "No apport report written because the error message indicates a dpkg I/O error"
  msgstr ""
@@@ -3116,37 -3075,30 +3116,37 @@@ msgstr "
  
  #. FIXME: fallback to a default mirror here instead
  #. and provide a config option to define that default
 -#: methods/mirror.cc:200
 +#: methods/mirror.cc:256
  #, c-format
  msgid "No mirror file '%s' found "
  msgstr ""
  
 -#: methods/mirror.cc:343
 +#. FIXME: fallback to a default mirror here instead
 +#. and provide a config option to define that default
 +#: methods/mirror.cc:263
 +#, c-format
 +msgid "Can not read mirror file '%s'"
 +msgstr ""
 +
 +#: methods/mirror.cc:407
  #, c-format
  msgid "[Mirror: %s]"
  msgstr ""
  
 -#: methods/rred.cc:465
 +#: methods/rred.cc:503
  #, c-format
  msgid ""
  "Could not patch %s with mmap and with file operation usage - the patch seems "
  "to be corrupt."
  msgstr ""
  
 -#: methods/rred.cc:470
 +#: methods/rred.cc:508
  #, c-format
  msgid ""
  "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
  "to be corrupt."
  msgstr ""
  
 -#: methods/rsh.cc:329
 +#: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""