* 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

diff --combined apt-pkg/deb/dpkgpm.cc
index f220e2bce936d4b8e2811a8b8393c226b950a44c,8abe3f5c612c1e5f8330a4c0dcea5a4497e3b87b..8ecb683d4e0d8dca01280098d8d6a761c9c83c34
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -12,7 -12,6 +12,7 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/depcache.h>
 +#include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/strutl.h>
  #include <apti18n.h>
  #include <apt-pkg/fileutl.h>
@@@ -25,7 -24,6 +25,7 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 +#include <string.h>
  #include <stdio.h>
  #include <string.h>
  #include <algorithm>
@@@ -107,7 -105,7 +107,7 @@@ ionice(int PID
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
     : pkgPackageManager(Cache), dpkgbuf_pos(0),
 -     term_out(NULL), PackagesDone(0), PackagesTotal(0)
 +     term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0)
  {
  }
                                                                        /*}}}*/
@@@ -343,6 -341,7 +343,6 @@@ bool pkgDPkgPM::RunScriptsWithPkgs(cons
  
     return true;
  }
 -
                                                                        /*}}}*/
  // DPkgPM::DoStdin - Read stdin and pass to slave pty                 /*{{{*/
  // ---------------------------------------------------------------------
@@@ -412,7 -411,7 +412,7 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i
        'processing: trigproc: trigger'
            
     */
 -   char* list[5];
 +   char* list[6];
     //        dpkg sends multiline error messages sometimes (see
     //        #374195 for a example. we should support this by
     //        either patching dpkg to not send multiline over the
@@@ -460,14 -459,6 +460,14 @@@
  
     if(strncmp(action,"error",strlen("error")) == 0)
     {
 +      // urgs, sometime has ":" in its error string so that we
 +      // end up with the error message split between list[3]
 +      // and list[4], e.g. the message: 
 +      // "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..."
 +      // concat them again
 +      if( list[4] != NULL )
 +       list[3][strlen(list[3])] = ':';
 +
        status << "pmerror:" << list[1]
             << ":"  << (PackagesDone/float(PackagesTotal)*100.0) 
             << ":" << list[3]
@@@ -476,8 -467,6 +476,8 @@@
         write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
         std::clog << "send: '" << status.str() << "'" << endl;
 +      pkgFailures++;
 +      WriteApportReport(list[1], list[3]);
        return;
     }
     else if(strncmp(action,"conffile",strlen("conffile")) == 0)
@@@ -562,7 -551,7 +562,7 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat
  }
                                                                        /*}}}*/
  // DPkgPM::WriteHistoryTag                                            /*{{{*/
 -void pkgDPkgPM::WriteHistoryTag(string tag, string value)
 +void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value)
  {
     if (value.size() > 0)
     {
@@@ -603,7 -592,7 +603,7 @@@ bool pkgDPkgPM::OpenLog(
                                   _config->Find("Dir::Log::History"));
     if (!history_name.empty())
     {
 -      history_out = fopen(history_name.c_str(),"a");
 +      FILE *history_out = fopen(history_name.c_str(),"a");
        chmod(history_name.c_str(), 0644);
        fprintf(history_out, "\nStart-Date: %s\n", timestr);
        string remove, purge, install, upgrade, downgrade;
@@@ -623,12 -612,12 +623,12 @@@
               remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
         }
        }
 -      WriteHistoryTag("Install", install);
 -      WriteHistoryTag("Upgrade", upgrade);
 -      WriteHistoryTag("Downgrade",downgrade);
 -      WriteHistoryTag("Remove",remove);
 -      WriteHistoryTag("Purge",purge);
 -      fflush(history_out);
 +      WriteHistoryTag(history_out, "Install", install);
 +      WriteHistoryTag(history_out, "Upgrade", upgrade);
 +      WriteHistoryTag(history_out, "Downgrade",downgrade);
 +      WriteHistoryTag(history_out, "Remove",remove);
 +      WriteHistoryTag(history_out, "Purge",purge);
 +      fclose(history_out);
     }
     
     return true;
@@@ -651,11 -640,10 +651,11 @@@ bool pkgDPkgPM::CloseLog(
     }
     term_out = NULL;
  
 -   if(history_out)
 +   string history_name = flCombine(_config->FindDir("Dir::Log"),
 +                                 _config->Find("Dir::Log::History"));
 +   if (!history_name.empty())
     {
 -      if (dpkg_error.size() > 0)
 -       fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
 +      FILE *history_out = fopen(history_name.c_str(),"a");
        fprintf(history_out, "End-Date: %s\n", timestr);
        fclose(history_out);
     }
@@@ -958,6 -946,7 +958,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd
            rtt = tt;
            cfmakeraw(&rtt);
            rtt.c_lflag &= ~ECHO;
+           rtt.c_lflag |= ISIG;
            // block SIGTTOU during tcsetattr to prevent a hang if
            // the process is a member of the background process group
            // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html
@@@ -1072,6 -1061,7 +1073,6 @@@
            signal(SIGHUP,old_SIGHUP);
            return _error->Errno("waitpid","Couldn't wait for subprocess");
         }
 -
         // wait for input or output here
         FD_ZERO(&rfds);
         if (!stdin_is_dev_null)
@@@ -1127,7 -1117,6 +1128,7 @@@
         if(stopOnError)
            RunScripts("DPkg::Post-Invoke");
  
 +       string dpkg_error;
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
            strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
         else if (WIFEXITED(Status) != 0)
@@@ -1136,17 -1125,7 +1137,17 @@@
            strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
  
         if(dpkg_error.size() > 0)
 +       {
            _error->Error(dpkg_error.c_str());
 +          string history_name = flCombine(_config->FindDir("Dir::Log"),
 +                                          _config->Find("Dir::Log::History"));
 +          if (!history_name.empty())
 +          {
 +             FILE *history_out = fopen(history_name.c_str(),"a");
 +             fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
 +             fclose(history_out);
 +          }
 +       }
  
         if(stopOnError) 
         {
@@@ -1172,186 -1151,3 +1173,186 @@@ void pkgDPkgPM::Reset(
     List.erase(List.begin(),List.end());
  }
                                                                        /*}}}*/
 +// pkgDpkgPM::WriteApportReport - write out error report pkg failure  /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) 
 +{
 +   string pkgname, reportfile, srcpkgname, pkgver, arch;
 +   string::size_type pos;
 +   FILE *report;
 +
 +   if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
 +   {
 +      std::clog << "configured to not write apport reports" << std::endl;
 +      return;
 +   }
 +
 +   // only report the first errors
 +   if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3))
 +   {
 +      std::clog << _("No apport report written because MaxReports is reached already") << std::endl;
 +      return;
 +   }
 +
 +   // check if its not a follow up error 
 +   const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured");
 +   if(strstr(errormsg, needle) != NULL) {
 +      std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl;
 +      return;
 +   }
 +
 +   // do not report disk-full failures 
 +   if(strstr(errormsg, strerror(ENOSPC)) != NULL) {
 +      std::clog << _("No apport report written because the error message indicates a disk full error") << std::endl;
 +      return;
 +   }
 +
 +   // do not report out-of-memory failures 
 +   if(strstr(errormsg, strerror(ENOMEM)) != 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;
 +      return;
 +   }
 +
 +   // get the pkgname and reportfile
 +   pkgname = flNotDir(pkgpath);
 +   pos = pkgname.find('_');
 +   if(pos != string::npos)
 +      pkgname = pkgname.substr(0, pos);
 +
 +   // find the package versin and source package name
 +   pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname);
 +   if (Pkg.end() == true)
 +      return;
 +   pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
 +   if (Ver.end() == true)
 +      return;
 +   pkgver = Ver.VerStr() == NULL ? "unknown" : Ver.VerStr();
 +   pkgRecords Recs(Cache);
 +   pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
 +   srcpkgname = Parse.SourcePkg();
 +   if(srcpkgname.empty())
 +      srcpkgname = pkgname;
 +
 +   // if the file exists already, we check:
 +   // - if it was reported already (touched by apport). 
 +   //   If not, we do nothing, otherwise
 +   //    we overwrite it. This is the same behaviour as apport
 +   // - if we have a report with the same pkgversion already
 +   //   then we skip it
 +   reportfile = flCombine("/var/crash",pkgname+".0.crash");
 +   if(FileExists(reportfile))
 +   {
 +      struct stat buf;
 +      char strbuf[255];
 +
 +      // check atime/mtime
 +      stat(reportfile.c_str(), &buf);
 +      if(buf.st_mtime > buf.st_atime)
 +       return;
 +
 +      // check if the existing report is the same version
 +      report = fopen(reportfile.c_str(),"r");
 +      while(fgets(strbuf, sizeof(strbuf), report) != NULL)
 +      {
 +       if(strstr(strbuf,"Package:") == strbuf)
 +       {
 +          char pkgname[255], version[255];
 +          if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2)
 +             if(strcmp(pkgver.c_str(), version) == 0)
 +             {
 +                fclose(report);
 +                return;
 +             }
 +       }
 +      }
 +      fclose(report);
 +   }
 +
 +   // now write the report
 +   arch = _config->Find("APT::Architecture");
 +   report = fopen(reportfile.c_str(),"w");
 +   if(report == NULL)
 +      return;
 +   if(_config->FindB("DPkgPM::InitialReportOnly",false) == true)
 +      chmod(reportfile.c_str(), 0);
 +   else
 +      chmod(reportfile.c_str(), 0600);
 +   fprintf(report, "ProblemType: Package\n");
 +   fprintf(report, "Architecture: %s\n", arch.c_str());
 +   time_t now = time(NULL);
 +   fprintf(report, "Date: %s" , ctime(&now));
 +   fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str());
 +   fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str());
 +   fprintf(report, "ErrorMessage:\n %s\n", errormsg);
 +
 +   // ensure that the log is flushed
 +   if(term_out)
 +      fflush(term_out);
 +
 +   // attach terminal log it if we have it
 +   string logfile_name = _config->FindFile("Dir::Log::Terminal");
 +   if (!logfile_name.empty())
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      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);
 +       fclose(log);
 +      }
 +   }
 +
 +   // log the ordering 
 +   const char *ops_str[] = {"Install", "Configure","Remove","Purge"};
 +   fprintf(report, "AptOrdering:\n");
 +   for (vector<Item>::iterator I = List.begin(); I != List.end(); I++)
 +      fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
 +
 +   // attach dmesg log (to learn about segfaults)
 +   if (FileExists("/bin/dmesg"))
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "Dmesg:\n");
 +      log = popen("/bin/dmesg","r");
 +      if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +       fclose(log);
 +      }
 +   }
 +
 +   // attach df -l log (to learn about filesystem status)
 +   if (FileExists("/bin/df"))
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "Df:\n");
 +      log = popen("/bin/df -l","r");
 +      if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +       fclose(log);
 +      }
 +   }
 +
 +   fclose(report);
 +
 +}
 +                                                                      /*}}}*/

diff --combined debian/changelog
index 8af45b1a9f934a98520b4f09b28d4121f85559ea,ffbc9f459f2af9f4d060c43bccc88cec36287fa9..7b20178ac7974b9bf31af40053fa32b2d9322769
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,15 +1,7 @@@
 -apt (0.7.25.4) UNRELEASED; urgency=low
 +apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low
  
 -  [ Ivan Masár ]
 -  * Slovak translation update. Closes: #568294
 -  
    [ Michael Vogt ]
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
    * methods/http.cc:
 -    - add cache-control headers even if no cache is given to allow
 -      adding options for intercepting proxies
      - 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
@@@ -9,9 -17,11 +9,14 @@@
    * 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
  
    [ Robert Collins ]
    * Change the package index Info methods to allow apt-cache policy to be
@@@ -20,16 -30,6 +25,16 @@@
  
   -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
  
 +apt (0.7.25.3ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged with the debian-sid branch
 +  
 +  [ 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 ]
@@@ -150,58 -150,6 +155,58 @@@ 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.25.2) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/cdromutl.cc:
 +    - fix UnmountCdrom() fails, give it a bit more time and try
 +      the umount again
 +  * apt-pkg/cdrom.cc:
 +    - fix crash in pkgUdevCdromDevices
 +  * methods/cdrom.cc:
 +    - fixes in multi cdrom setup code (closes: #549312)
 +    - add new "Acquire::cdrom::AutoDetect" config that enables/disables
 +      the dlopen of libudev for automatic cdrom detection. Off by default
 +      currently, feedback/testing welcome
 +  * cmdline/apt-cdrom.cc:
 +    - add new --auto-detect option that uses libudev to figure out
 +      the cdrom/mount-point
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jan 2010 16:11:32 +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 ]
@@@ -345,29 -293,6 +350,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 ]
@@@ -437,59 -362,6 +442,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 ]
@@@ -719,34 -591,6 +724,34 @@@ apt (0.7.22) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
  
 +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 ]
@@@ -790,125 -634,6 +795,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 ]
@@@ -977,12 -702,6 +982,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 ]
@@@ -1281,90 -1000,6 +1286,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 ]
@@@ -1591,271 -1226,9 +1596,271 @@@ 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 ]
 +  * apt-pkg/acquire-item.cc:
 +    - fix signaure removal on transient network failures LP: #220627
 +      (thanks to Scott James Remnant)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 16:32:49 +0200
 +
 +apt (0.7.9ubuntu16) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - only check against master-keys in net-update to not break
 +      custom CDs (thanks to Colin Watson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 14:17:14 +0200
 +
 +apt (0.7.9ubuntu15) hardy; urgency=low
 +
 +  * 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)
 +
 + -- 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 ]
 +  * doc/apt_preferences.5.xml:
 +    - fix typo (LP: #150900)
 +  * doc/example/sources.list:
 +    - updated for hardy (LP: #195879)
 +  * debian/apt.cron.daily:
 +    - 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:
 +    - use admin user proxy settings
 +  * cmdline/apt-get.cc:
 +    - fix task installation (thanks to Colin Watson)
 +
 + -- 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
@@@ -1978,193 -1351,6 +1983,193 @@@ apt (0.7.7) unstable; urgency=lo
   
   -- 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
@@@ -2199,14 -1385,6 +2204,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 ]
@@@ -2267,90 -1445,6 +2272,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.
@@@ -2444,121 -1538,7 +2449,121 @@@ 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.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
  
  apt (0.7.0) experimental; urgency=low
  
@@@ -2587,29 -1567,6 +2592,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +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)
 +
 + -- 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
    
    * NMU
@@@ -2645,7 -1602,7 +2650,7 @@@ apt (0.6.46.3-0.2) unstable; urgency=hi
    * Fix FTBFS on most arches (regression from the fix of #400874)
  
   -- Andreas Barth <aba@not.so.argh.org>  Tue,  5 Dec 2006 15:51:22 +0000 
 -  
 +
  apt (0.6.46.3-0.1) unstable; urgency=high
  
    * Non-maintainer upload with permission of Michael Vogt.
@@@ -2656,26 -1613,6 +2661,26 @@@
    
   -- Andreas Barth <aba@not.so.argh.org>  Tue,  5 Dec 2006 10:34:56 +0000
  
 +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) unstable; urgency=low
  
    * apt-pkg/deb/dpkgpm.cc:
@@@ -2771,173 -1708,6 +2776,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:
@@@ -2983,37 -1753,6 +2988,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
@@@ -3102,26 -1841,6 +3107,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:
@@@ -3154,38 -1873,6 +3159,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:
@@@ -3209,24 -1896,6 +3214,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:
@@@ -3250,19 -1919,6 +3255,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:  
@@@ -3283,22 -1939,6 +3288,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:
@@@ -3327,7 -1967,7 +3332,7 @@@ apt (0.6.42.2) unstable; urgency=hig
    * Priority high to get the AMD key into testing ASAP.
  
   -- Frans Pop <fjp@debian.org>  Sun, 30 Oct 2005 21:29:11 +0100
 - 
 +
  apt (0.6.42.1) unstable; urgency=low
  
    * fix a incorrect example in the apt_prefrences man page
@@@ -3405,80 -2045,6 +3410,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 
@@@ -3488,12 -2054,6 +3493,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
@@@ -3509,39 -2069,6 +3514,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
@@@ -3554,13 -2081,6 +3559,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
@@@ -5439,4 -3959,3 +5444,4 @@@ apt (0.0.1) unstable; urgency=lo
    * Initial Release.
  
   -- Scott K. Ellis <scott@debian.org>  Tue, 31 Mar 1998 12:49:28 -0500
 +