merged from debian-experimental

diff --combined apt-pkg/deb/dpkgpm.cc
index 4f2b35a01b6e82c91ef559fc8710713ac197b639,019b72bb83e01d7af5066599cae5122518923af5..751e1fbe97471388511578212023c0507acd77a3
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -26,6 -26,7 +26,6 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 -#include <string.h>
  #include <stdio.h>
  #include <string.h>
  #include <algorithm>
@@@ -45,6 -46,21 +45,21 @@@
  
  using namespace std;
  
+ class pkgDPkgPMPrivate 
+ {
+ public:
+    pkgDPkgPMPrivate() : dpkgbuf_pos(0), term_out(NULL), history_out(NULL)
+    {
+    }
+    bool stdin_is_dev_null;
+    // the buffer we use for the dpkg status-fd reading
+    char dpkgbuf[1024];
+    int dpkgbuf_pos;
+    FILE *term_out;
+    FILE *history_out;
+    string dpkg_error;
+ };
+ 
  namespace
  {
    // Maps the dpkg "processing" info to human readable names.  Entry 0
@@@ -109,9 -125,9 +124,9 @@@ ionice(int PID
  // ---------------------------------------------------------------------
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-    : pkgPackageManager(Cache), dpkgbuf_pos(0),
-      term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0)
+    : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0)
  {
+    d = new pkgDPkgPMPrivate();
  }
                                                                        /*}}}*/
  // DPkgPM::pkgDPkgPM - Destructor                                     /*{{{*/
@@@ -119,6 -135,7 +134,7 @@@
  /* */
  pkgDPkgPM::~pkgDPkgPM()
  {
+    delete d;
  }
                                                                        /*}}}*/
  // DPkgPM::Install - Install a package                                        /*{{{*/
@@@ -375,7 -392,7 +391,7 @@@ void pkgDPkgPM::DoStdin(int master
     if (len)
        write(master, input_buf, len);
     else
-       stdin_is_dev_null = true;
+       d->stdin_is_dev_null = true;
  }
                                                                        /*}}}*/
  // DPkgPM::DoTerminalPty - Read the terminal pty and write log                /*{{{*/
@@@ -400,8 -417,8 +416,8 @@@ void pkgDPkgPM::DoTerminalPty(int maste
     if(len <= 0) 
        return;
     write(1, term_buf, len);
-    if(term_out)
-       fwrite(term_buf, len, sizeof(char), term_out);
+    if(d->term_out)
+       fwrite(term_buf, len, sizeof(char), d->term_out);
  }
                                                                        /*}}}*/
  // DPkgPM::ProcessDpkgStatusBuf                                               /*{{{*/
@@@ -605,14 -622,14 +621,14 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat
     char *p, *q;
     int len;
  
-    len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos);
-    dpkgbuf_pos += len;
+    len=read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], sizeof(d->dpkgbuf)-d->dpkgbuf_pos);
+    d->dpkgbuf_pos += len;
     if(len <= 0)
        return;
  
     // process line by line if we have a buffer
-    p = q = dpkgbuf;
-    while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL)
+    p = q = d->dpkgbuf;
+    while((q=(char*)memchr(p, '\n', d->dpkgbuf+d->dpkgbuf_pos-p)) != NULL)
     {
        *q = 0;
        ProcessDpkgStatusLine(OutStatusFd, p);
@@@ -620,8 -637,8 +636,8 @@@
     }
  
     // now move the unprocessed bits (after the final \n that is now a 0x0) 
-    // to the start and update dpkgbuf_pos
-    p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos);
+    // to the start and update d->dpkgbuf_pos
+    p = (char*)memrchr(d->dpkgbuf, 0, d->dpkgbuf_pos);
     if(p == NULL)
        return;
  
@@@ -629,8 -646,8 +645,8 @@@
     p++;
  
     // move the unprocessed tail to the start and update pos
-    memmove(dpkgbuf, p, p-dpkgbuf);
-    dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
+    memmove(d->dpkgbuf, p, p-d->dpkgbuf);
+    d->dpkgbuf_pos = d->dpkgbuf+d->dpkgbuf_pos-p;
  }
                                                                        /*}}}*/
  // DPkgPM::WriteHistoryTag                                            /*{{{*/
@@@ -642,7 -659,7 +658,7 @@@ void pkgDPkgPM::WriteHistoryTag(string 
     // poor mans rstrip(", ")
     if (value[length-2] == ',' && value[length-1] == ' ')
        value.erase(length - 2, 2);
-    fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str());
+    fprintf(d->history_out, "%s: %s\n", tag.c_str(), value.c_str());
  }                                                                     /*}}}*/
  // DPkgPM::OpenLog                                                    /*{{{*/
  bool pkgDPkgPM::OpenLog()
@@@ -663,11 -680,11 +679,11 @@@
                                   _config->Find("Dir::Log::Terminal"));
     if (!logfile_name.empty())
     {
-       term_out = fopen(logfile_name.c_str(),"a");
-       if (term_out == NULL)
+       d->term_out = fopen(logfile_name.c_str(),"a");
+       if (d->term_out == NULL)
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
-       setvbuf(term_out, NULL, _IONBF, 0);
-       SetCloseExec(fileno(term_out), true);
+       setvbuf(d->term_out, NULL, _IONBF, 0);
+       SetCloseExec(fileno(d->term_out), true);
        struct passwd *pw;
        struct group *gr;
        pw = getpwnam("root");
@@@ -675,7 -692,7 +691,7 @@@
        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);
+       fprintf(d->term_out, "\nLog started: %s\n", timestr);
     }
  
     // write your history
@@@ -683,11 -700,11 +699,11 @@@
                                   _config->Find("Dir::Log::History"));
     if (!history_name.empty())
     {
-       history_out = fopen(history_name.c_str(),"a");
-       if (history_out == NULL)
+       d->history_out = fopen(history_name.c_str(),"a");
+       if (d->history_out == NULL)
         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);
+       fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
        string remove, purge, install, reinstall, upgrade, downgrade;
        for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
        {
@@@ -728,7 -745,7 +744,7 @@@
        WriteHistoryTag("Downgrade",downgrade);
        WriteHistoryTag("Remove",remove);
        WriteHistoryTag("Purge",purge);
-       fflush(history_out);
+       fflush(d->history_out);
     }
     
     return true;
@@@ -742,16 -759,16 +758,16 @@@ bool pkgDPkgPM::CloseLog(
     struct tm *tmp = localtime(&t);
     strftime(timestr, sizeof(timestr), "%F  %T", tmp);
  
-    if(term_out)
+    if(d->term_out)
     {
-       fprintf(term_out, "Log ended: ");
-       fprintf(term_out, "%s", timestr);
-       fprintf(term_out, "\n");
-       fclose(term_out);
+       fprintf(d->term_out, "Log ended: ");
+       fprintf(d->term_out, "%s", timestr);
+       fprintf(d->term_out, "\n");
+       fclose(d->term_out);
     }
-    term_out = NULL;
+    d->term_out = NULL;
  
-    if(history_out)
+    if(d->history_out)
     {
        if (disappearedPkgs.empty() == false)
        {
@@@ -768,12 -785,12 +784,12 @@@
         }
         WriteHistoryTag("Disappeared", disappear);
        }
-       if (dpkg_error.empty() == false)
-        fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
-       fprintf(history_out, "End-Date: %s\n", timestr);
-       fclose(history_out);
+       if (d->dpkg_error.empty() == false)
+        fprintf(d->history_out, "Error: %s\n", d->dpkg_error.c_str());
+       fprintf(d->history_out, "End-Date: %s\n", timestr);
+       fclose(d->history_out);
     }
-    history_out = NULL;
+    d->history_out = NULL;
  
     return true;
  }
@@@ -881,7 -898,7 +897,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd
        }
     }
  
-    stdin_is_dev_null = false;
+    d->stdin_is_dev_null = false;
  
     // create log
     OpenLog();
@@@ -1081,8 -1098,8 +1097,8 @@@
            const char *s = _("Can not write log, openpty() "
                              "failed (/dev/pts not mounted?)\n");
            fprintf(stderr, "%s",s);
-             if(term_out)
-               fprintf(term_out, "%s",s);
+             if(d->term_out)
+               fprintf(d->term_out, "%s",s);
            master = slave = -1;
         }  else {
            struct termios rtt;
@@@ -1212,7 -1229,7 +1228,7 @@@
  
         // wait for input or output here
         FD_ZERO(&rfds);
-        if (master >= 0 && !stdin_is_dev_null)
+        if (master >= 0 && !d->stdin_is_dev_null)
            FD_SET(0, &rfds); 
         FD_SET(_dpkgin, &rfds);
         if(master >= 0)
@@@ -1266,14 -1283,14 +1282,14 @@@
            RunScripts("DPkg::Post-Invoke");
  
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
-           strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
+           strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
         else if (WIFEXITED(Status) != 0)
-           strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+           strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
         else 
-           strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+           strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
  
-        if(dpkg_error.size() > 0)
-           _error->Error("%s", dpkg_error.c_str());
+        if(d->dpkg_error.size() > 0)
+           _error->Error("%s", d->dpkg_error.c_str());
  
         if(stopOnError) 
         {
@@@ -1325,7 -1342,7 +1341,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;
@@@ -1352,49 -1369,18 +1368,49 @@@
     }
  
     // 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 errors encountered when decompressing packages
 +   if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != 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('_');
@@@ -1468,8 -1454,8 +1484,8 @@@
     fprintf(report, "ErrorMessage:\n %s\n", errormsg);
  
     // ensure that the log is flushed
-    if(term_out)
-       fflush(term_out);
+    if(d->term_out)
+       fflush(d->term_out);
  
     // attach terminal log it if we have it
     string logfile_name = _config->FindFile("Dir::Log::Terminal");
@@@ -1481,24 -1467,6 +1497,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 74017cb7fc6d9ed3e1499f955e24cc2b4862d981,72a0bb542a404467ff48f601254eba94eed837ed..6943dcfcdd079018420983bf6b3acdbd35af4dfb
--- 1/apt-pkg/depcache.cc
--- 2/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -406,60 -406,8 +406,8 @@@ bool pkgDepCache::CheckDep(DepIterator 
                                                                        /*}}}*/
  // DepCache::AddSizes - Add the packages sizes to the counters                /*{{{*/
  // ---------------------------------------------------------------------
- /* Call with Mult = -1 to preform the inverse opration
-    The Mult increases the complexity of the calulations here and is unused -
-    or do we really have a usecase for removing the size of a package two
-    times? So let us replace it with a simple bool and be done with it… */
- __deprecated void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult)
- {
-    StateCache &P = PkgState[Pkg->ID];
-    
-    if (Pkg->VersionList == 0)
-       return;
-    
-    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && 
-        P.Keep() == true)
-       return;
-    
-    // Compute the size data
-    if (P.NewInstall() == true)
-    {
-       iUsrSize += (signed long long)(Mult*P.InstVerIter(*this)->InstalledSize);
-       iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-       return;
-    }
-    
-    // Upgrading
-    if (Pkg->CurrentVer != 0 && 
-        (P.InstallVer != (Version *)Pkg.CurrentVer() || 
-       (P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0)
-    {
-       iUsrSize += (signed long long)(Mult*((signed long long)P.InstVerIter(*this)->InstalledSize - 
-                       (signed long long)Pkg.CurrentVer()->InstalledSize));
-       iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-       return;
-    }
-    
-    // Reinstall
-    if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack &&
-        P.Delete() == false)
-    {
-       iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-       return;
-    }
-    
-    // Removing
-    if (Pkg->CurrentVer != 0 && P.InstallVer == 0)
-    {
-       iUsrSize -= (signed long long)(Mult*Pkg.CurrentVer()->InstalledSize);
-       return;
-    }   
- }
-                                                                       /*}}}*/
- // DepCache::AddSizes - Add the packages sizes to the counters                /*{{{*/
- // ---------------------------------------------------------------------
  /* Call with Inverse = true to preform the inverse opration */
- void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse)
+ void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse)
  {
     StateCache &P = PkgState[Pkg->ID];
     
@@@ -530,8 -478,9 +478,9 @@@
     calld Remove/Add itself. Remember, dependencies can be circular so
     while processing a dep for Pkg it is possible that Add/Remove
     will be called on Pkg */
- void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add)
+ void pkgDepCache::AddStates(const PkgIterator &Pkg, bool const Invert)
  {
+    signed char const Add = (Invert == false) ? 1 : -1;
     StateCache &State = PkgState[Pkg->ID];
     
     // The Package is broken (either minimal dep or policy dep)
@@@ -806,17 -755,17 +755,17 @@@ void pkgDepCache::Update(PkgIterator co
  // DepCache::MarkKeep - Put the package in the keep state             /*{{{*/
  // ---------------------------------------------------------------------
  /* */
- void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
+ bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
                             unsigned long Depth)
  {
     if (IsModeChangeOk(ModeKeep, Pkg, Depth, FromUser) == false)
-       return;
+       return false;
  
     /* Reject an attempt to keep a non-source broken installed package, those
        must be upgraded */
     if (Pkg.State() == PkgIterator::NeedsUnpack && 
         Pkg.CurrentVer().Downloadable() == false)
-       return;
+       return false;
  
     /* We changed the soft state all the time so the UI is a bit nicer
        to use */
@@@ -824,7 -773,7 +773,7 @@@
  
     // Check that it is not already kept
     if (P.Mode == ModeKeep)
-       return;
+       return true;
  
     if (Soft == true)
        P.iFlags |= AutoKept;
@@@ -857,31 -806,31 +806,31 @@@
        P.InstallVer = Pkg.CurrentVer();
  
     AddStates(Pkg);
- 
     Update(Pkg);
- 
     AddSizes(Pkg);
+ 
+    return true;
  }
                                                                        /*}}}*/
  // DepCache::MarkDelete - Put the package in the delete state         /*{{{*/
  // ---------------------------------------------------------------------
  /* */
- void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
+ bool pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
                               unsigned long Depth, bool FromUser)
  {
     if (IsModeChangeOk(ModeDelete, Pkg, Depth, FromUser) == false)
-       return;
+       return false;
  
     StateCache &P = PkgState[Pkg->ID];
  
     // Check that it is not already marked for delete
     if ((P.Mode == ModeDelete || P.InstallVer == 0) && 
         (Pkg.Purge() == true || rPurge == false))
-       return;
+       return true;
  
     // check if we are allowed to remove the package
     if (IsDeleteOk(Pkg,rPurge,Depth,FromUser) == false)
-       return;
+       return false;
  
     P.iFlags &= ~(AutoKept | Purge);
     if (rPurge == true)
@@@ -905,6 -854,7 +854,7 @@@
     Update(Pkg);
     AddSizes(Pkg);
  
+    return true;
  }
                                                                        /*}}}*/
  // DepCache::IsDeleteOk - check if it is ok to remove this package    /*{{{*/
@@@ -917,7 -867,6 +867,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)
@@@ -986,18 -935,18 +936,18 @@@ bool pkgDepCache::IsModeChangeOk(ModeLi
  // DepCache::MarkInstall - Put the package in the install state               /*{{{*/
  // ---------------------------------------------------------------------
  /* */
- void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
+ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
                              unsigned long Depth, bool FromUser,
                              bool ForceImportantDeps)
  {
     if (IsModeChangeOk(ModeInstall, Pkg, Depth, FromUser) == false)
-       return;
+       return false;
  
     StateCache &P = PkgState[Pkg->ID];
  
     // See if there is even any possible instalation candidate
     if (P.CandidateVer == 0)
-       return;
+       return false;
  
     /* Check that it is not already marked for install and that it can be 
        installed */
@@@ -1006,13 -955,13 +956,13 @@@
        P.CandidateVer == (Version *)Pkg.CurrentVer()))
     {
        if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
-        MarkKeep(Pkg, false, FromUser, Depth+1);
-       return;
+        return MarkKeep(Pkg, false, FromUser, Depth+1);
+       return true;
     }
  
     // check if we are allowed to install the package
     if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
-       return;
+       return false;
  
     ActionGroup group(*this);
     P.iFlags &= ~AutoKept;
@@@ -1047,8 -996,8 +997,8 @@@
     Update(Pkg);
     AddSizes(Pkg);
  
-    if (AutoInst == false)
-       return;
+    if (AutoInst == false || _config->Find("APT::Solver", "internal") != "internal")
+       return true;
  
     if (DebugMarker == true)
        std::clog << OutputInDepth(Depth) << "MarkInstall " << Pkg << " FU=" << FromUser << std::endl;
@@@ -1092,7 -1041,7 +1042,7 @@@
            continue;
         // if the dependency was critical, we can't install it, so remove it again
         MarkDelete(Pkg,false,Depth + 1, false);
-        return;
+        return false;
        }
  
        /* Check if any ImportantDep() (but not Critical) were added
@@@ -1223,14 -1172,17 +1173,17 @@@
               continue;
  
            if (PkgState[Pkg->ID].CandidateVer != *I &&
-               Start->Type == Dep::DpkgBreaks)
-              MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps);
-           else
-              MarkDelete(Pkg,false,Depth + 1, false);
+               Start->Type == Dep::DpkgBreaks &&
+               MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true)
+              continue;
+           else if (MarkDelete(Pkg,false,Depth + 1, false) == false)
+              break;
         }
         continue;
        }      
     }
+ 
+    return Dep.end() == true;
  }
                                                                        /*}}}*/
  // DepCache::IsInstallOk - check if it is ok to install this package  /*{{{*/
@@@ -1269,7 -1221,7 +1222,7 @@@ void pkgDepCache::SetReInstall(PkgItera
  // DepCache::SetCandidateVersion - Change the candidate version               /*{{{*/
  // ---------------------------------------------------------------------
  /* */
- void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo)
+ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
  {
     pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
     StateCache &P = PkgState[Pkg->ID];
@@@ -1575,6 -1527,12 +1528,12 @@@ bool pkgDepCache::Policy::IsImportantDe
     return false;
  }
                                                                        /*}}}*/
+ // Policy::GetPriority - Get the priority of the package pin          /*{{{*/
+ signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &Pkg)
+ { return 0; };
+ signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &File)
+ { return 0; };
+                                                                       /*}}}*/
  pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()             /*{{{*/
  {
    DefaultRootSetFunc *f = new DefaultRootSetFunc;
@@@ -1600,6 -1558,9 +1559,9 @@@ bool pkgDepCache::MarkFollowsSuggests(
  // pkgDepCache::MarkRequired - the main mark algorithm                        /*{{{*/
  bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
  {
+    if (_config->Find("APT::Solver", "internal") != "internal")
+       return true;
+ 
     bool follow_recommends;
     bool follow_suggests;
     bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);

diff --combined apt-pkg/init.cc
index 2c350e0256e1a1917d20b582a940feaa4e0fe521,8f20c31df172b28e69ae89ec4139228453fe991f..4f3101687601a62f2ca534fcf81c1f51185ba41f
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -74,6 -74,7 +74,7 @@@ bool pkgInitConfig(Configuration &Cnf
     Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
     Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
     Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
+    Cnf.CndSet("Dir::Bin::solvers::","/usr/lib/apt/solvers");
     Cnf.CndSet("Dir::Media::MountPath","/media/apt");
  
     // State   
@@@ -87,9 -88,6 +88,9 @@@
        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$");
     }
  
     // Default cdrom mount point

diff --combined cmdline/apt-get.cc
index 08c78218836df5abcfd16cf65786b1fb89b83df6,a81e829e896a14cc234c66e0e2edc32f3b6fa69b..0cc6c04fcf111803f358b26a7a5670c6f0172113
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -135,6 -135,11 +135,11 @@@ bool YnPrompt(bool Default=true
        c1out << _("Y") << endl;
        return true;
     }
+    else if (_config->FindB("APT::Get::Assume-No",false) == true)
+    {
+       c1out << _("N") << endl;
+       return false;
+    }
  
     char response[1024] = "";
     cin.getline(response, sizeof(response));
@@@ -1894,8 -1899,7 +1899,7 @@@ bool DoInstall(CommandLine &CmdL
        {
         // Call the scored problem resolver
         Fix->InstallProtect();
-        if (Fix->Resolve(true) == false)
-           _error->Discard();
+        Fix->Resolve(true);
         delete Fix;
        }
  
@@@ -1921,8 -1925,11 +1925,11 @@@
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
         ShowBroken(c1out,Cache,false);
-        return _error->Error(_("Broken packages"));
-       }   
+        if (_error->PendingError() == true)
+           return false;
+        else
+           return _error->Error(_("Broken packages"));
+       }
     }
     if (!DoAutomaticRemove(Cache)) 
        return false;
@@@ -2305,6 -2312,8 +2312,8 @@@ bool DoDownload(CommandLine &CmdL
        strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
        // get the most appropriate hash
        HashString hash;
+       if (rec.SHA512Hash() != "")
+          hash = HashString("sha512", rec.SHA512Hash());
        if (rec.SHA256Hash() != "")
           hash = HashString("sha256", rec.SHA256Hash());
        else if (rec.SHA1Hash() != "")
@@@ -3113,10 -3122,7 +3122,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                               /*{{{*/
@@@ -3342,7 -3348,8 +3351,8 @@@ int main(int argc,const char *argv[]
        {'s',"dry-run","APT::Get::Simulate",0},
        {'s',"no-act","APT::Get::Simulate",0},
        {'y',"yes","APT::Get::Assume-Yes",0},
-       {'y',"assume-yes","APT::Get::Assume-Yes",0},      
+       {'y',"assume-yes","APT::Get::Assume-Yes",0},
+       {0,"assume-no","APT::Get::Assume-No",0},
        {'f',"fix-broken","APT::Get::Fix-Broken",0},
        {'u',"show-upgraded","APT::Get::Show-Upgraded",0},
        {'m',"ignore-missing","APT::Get::Fix-Missing",0},
@@@ -3372,6 -3379,7 +3382,7 @@@
        {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
        {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
        {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
+       {0,"solver","APT::Solver",CommandLine::HasArg},
        {'c',"config-file",0,CommandLine::ConfigFile},
        {'o',"option",0,CommandLine::ArbItem},
        {0,0,0,0}};

diff --combined debian/apt.dirs
index 31d811acc305c3b1324140d8d208923e6a4b9203,f9c0b6c3e54b7487d0a09cff219d691424c2558b..8284536557e669e0470854dd48d7e5a9f8a24d48
--- 1/debian/apt.dirs
--- 2/debian/apt.dirs
+++ b/debian/apt.dirs
@@@ -1,5 -1,6 +1,6 @@@
  usr/bin
  usr/lib/apt/methods
+ usr/lib/apt/solvers
  usr/lib/dpkg/methods/apt
  etc/apt
  etc/apt/apt.conf.d
@@@ -12,5 -13,4 +13,5 @@@ var/lib/apt/lists/partia
  var/lib/apt/mirrors/partial
  var/lib/apt/periodic
  var/log/apt
 +usr/share/apt
  usr/share/bug/apt

diff --combined debian/changelog
index de405738b73efbfcfe91a95ebb28ab70c5062811,bc7e4dd594af272576e24ce1a0bc03d832709c5d..c375692da5539ece90953f5949d19328bf61d564
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,92 +1,98 @@@
+ apt (0.8.16~exp4) UNRELEASED; urgency=low
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/pkgcache.h:
+     - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
+   * apt-pkg/pkgcachegen.cc:
+     - Write the file size to the cache
+   * apt-pkg/pkgcache.cc:
+     - Check that cache is at least CacheFileSize bytes large (LP: #16467)
+   
+   [ Michael Vogt ]
+   * merged latest fixes from debian-sid
+   * apt-pkg/cdrom.{cc,h}:
+     - cleanup old ABI break avoidance hacks
+ 
+  -- Julian Andres Klode <jak@debian.org>  Wed, 20 Jul 2011 16:23:55 +0200
+ 
+ apt (0.8.16~exp3) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/pkgcache.h:
+     - readd All{Foreign,Allowed} as suggested by Julian to
+       remain strictly API compatible
+   * apt-pkg/acquire*.{cc,h}:
+     - try even harder to support really big files in the fetcher by
+       converting (hopefully) everything to 'long long' (Closes: #632271)
+   * ftparchive/writer.cc:
+     - generate all checksums in one run over the file for Release
+   * cmdline/apt-get.cc:
+     - add an --assume-no option for testing to say 'no' to everything
+   * apt-pkg/deb/debmetaindex.cc:
+     - add trusted=yes option to mark unsigned (local) repository as trusted
+       based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
+ 
+   [ Michael Vogt ]
+   * merge fixes from the debian/unstable upload
+   * merge lp:~mvo/apt/sha512-template to get fixes for the 
+     sha1/md5 verifiation (closes: #632520)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 15 Jul 2011 09:56:17 +0200
+ 
+ apt (0.8.16~exp2) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
+     use the internal resolver can now be used also with external
+     ones as the usage is hidden in between the old API
+   * provide two edsp solvers in apt-utils:
+     - 'dump' to quickly output a complete scenario and
+     - 'apt' to use the internal as an external resolver
+   * apt-pkg/pkgcache.h:
+     - clean up mess with the "all" handling in MultiArch to
+       fix LP: #733741 cleanly for everyone now
+   * apt-pkg/depcache.cc:
+     - use a boolean instead of an int for Add/Remove in AddStates
+       similar to how it works with AddSizes
+     - let the Mark methods return if their marking was successful
+     - if a Breaks can't be upgraded, remove it. If it or a Conflict
+       can't be removed the installation of the breaker fails.
+   * cmdline/apt-get.cc:
+     - do not discard the error messages from the resolver and instead
+       only show the general 'Broken packages' message if nothing else
+ 
+   [ Stefano Zacchiroli ]
+   * doc/external-dependency-solver-protocol.txt:
+     - describe EDSP and the configuration interface around it
+   
+   [ Michael Vogt ]
+   * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
+   * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
+     without breaking the ABI
+   * increase ABI version and update package names
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
+ 
+ apt (0.8.16~exp1) experimental; urgency=low
+ 
+   * merged with the debian/unstable upload
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
+ 
+ apt (0.8.15.5) UNRELEASED; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/deblistparser.cc:
+     - do not assume that the last char on a line is a \n (Closes: #633350)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 27 Jul 2011 23:25:45 +0200
+ 
 +apt (0.8.15.4ubuntu1) oneiric; urgency=low
 +
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2011 13:19:49 +0200
 +
  apt (0.8.15.4) unstable; urgency=low
  
    [ David Miller ]
@@@ -68,39 -151,6 +157,39 @@@ apt (0.8.15.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 25 Jul 2011 15:04:43 +0200
  
 +apt (0.8.15.2ubuntu2) oneiric; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix missing download progress in apt-get download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 22 Jul 2011 13:20:49 +0200
 +
 +apt (0.8.15.2ubuntu1) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - improve error message for a expired Release file
 +  * apt-pkg/algorithms.cc:
 +    - Hold back packages that would enter "policy-broken" state on upgrade
 +      when doing a "apt-get upgrade"
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +  * apt-pkg/depcache.cc:
 +    - change default of APT::AutoRemove::SuggestsImportant to true
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Jul 2011 10:16:45 +0200
 +
  apt (0.8.15.2) unstable; urgency=high
  
    * fix from David Kalnischkies for the InRelease gpg verification 
@@@ -108,24 -158,6 +197,24 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
  
 +apt (0.8.15.1ubuntu2) oneiric; urgency=low
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - do not report errors encountered when decompressing packages
 +  
 +  [ Michael Vogt ]
 +  * fix from David Kalnischkies for the InRelease gpg verification 
 +    code (LP: #784473)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Jul 2011 14:42:02 +0200
 +
 +apt (0.8.15.1ubuntu1) oneiric; urgency=low
 +
 +  * merge from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:16:12 +0100
 +
  apt (0.8.15.1) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -149,17 -181,6 +238,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
  
 +apt (0.8.15ubuntu1) oneiric; 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>  Wed, 29 Jun 2011 09:03:39 +0100
 +
  apt (0.8.15) unstable; urgency=low
  
    [ Julian Andres Klode ]
@@@ -269,101 -290,185 +358,280 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
  
+ apt (0.8.15~exp3) experimental; urgency=low
+ 
+   * debian/control:
+     - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
+      libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
+     - use depends for the ${shlibs:Depends} to make the breaks work
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
+ 
+ apt (0.8.15~exp2) experimental; urgency=low
+ 
+   * debian/control:
+     - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
+ 
+ apt (0.8.15~exp1) experimental; 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
+ 
+   [ 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
+   * 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)
+ 
+   [ 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 
+   * debian/control:
+     - add libapt-pkg4.10 and libapt-inst1.2 library packages
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
+ 
+ apt (0.8.14.2) UNRELEASED; 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)
+   * 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
+ 
+   [ 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
+   * 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)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +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:
@@@ -406,42 -511,6 +674,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 ]
@@@ -478,12 -547,6 +746,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
@@@ -491,24 -554,6 +759,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 ]
@@@ -530,29 -575,6 +798,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 ]
@@@ -606,23 -628,6 +874,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 ]
@@@ -854,27 -859,6 +1122,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 ]
@@@ -894,48 -878,6 +1162,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 ]
@@@ -967,47 -909,6 +1235,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 ]
@@@ -1027,17 -928,6 +1295,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 ]
@@@ -1156,123 -1046,37 +1424,123 @@@ apt (0.8.4) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
 -apt (0.8.3) unstable; urgency=low
 +apt (0.8.3ubuntu7) maverick; urgency=low
  
 -  [ Programs translations ]
 -  * German (Holger Wansing). Closes: #596141
 +  [ 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
  
 -  [ Manpages translations ]
 -  * Japanese (KURASAWA Nozomu). Closes: #595862
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200
 +
 +apt (0.8.3ubuntu6) maverick; urgency=low
  
    [ Michael Vogt ]
 -  * apt-pkg/indexcopy.cc:
 -    - only use trusted.gpg.d directory if it exists
 -    - do not replace /dev/null when running in APT::CDROM::NoAct
 -      mode (LP: #612666), thanks to Colin Watson
 +  * 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 ]
 -  * ftparchive/apt-ftparchive.cc:
 -    - ensure that BinDirectory as well as Tree settings get
 -      the correct default FileMode setting (Closes: #595922)
 +  * 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 <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
  
 -apt (0.8.2) unstable; urgency=low
 +apt (0.8.3ubuntu5) maverick; urgency=low
  
 -  [ Manpages translations ]
 -  * Spanish (Omar Campagne). Closes: #595557
 +  * debian/apt.dirs:
 +    - add missing /usr/share/apt so that the keyring is installed
 +      into the right place (LP: #620576)
  
 -  [ David Kalnischkies ]
 -  * apt-pkg/versionmatch.cc:
 -    - do not accept 'Pin: origin "' (missing closing ") as a valid
 -      way to pin a local archive: either "" or none…
 -  * apt-pkg/deb/dpkgpm.cc:
 + -- 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 ]
 +  * German (Holger Wansing). Closes: #596141
 +
 +  [ Manpages translations ]
 +  * Japanese (KURASAWA Nozomu). Closes: #595862
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/indexcopy.cc:
 +    - only use trusted.gpg.d directory if it exists
 +    - do not replace /dev/null when running in APT::CDROM::NoAct
 +      mode (LP: #612666), thanks to Colin Watson
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/apt-ftparchive.cc:
 +    - ensure that BinDirectory as well as Tree settings get
 +      the correct default FileMode setting (Closes: #595922)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 +
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/versionmatch.cc:
 +    - do not accept 'Pin: origin "' (missing closing ") as a valid
 +      way to pin a local archive: either "" or none…
 +  * apt-pkg/deb/dpkgpm.cc:
      - create Dir::Log if needed to support /var/log as tmpfs or similar,
        inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
    * apt-pkg/indexcopy.cc:
@@@ -1334,69 -1138,6 +1602,69 @@@ apt (0.8.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
 +apt (0.8.0ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Simplified Chinese (Aron Xu). Closes: #594458
 +  * Bulgarian (Damyan Ivanov). Closes: #594627
 +  * Portuguese (Miguel Figueiredo). Closes: #594668
 +  * Korean (Changwoo Ryu). Closes: #594809
 +
 +  [ Manpages translations ]
 +  * Portuguese (Américo Monteiro)
 +
 +  [ David Kalnischkies ]
 +  * 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 ]
@@@ -1439,20 -1180,6 +1707,20 @@@ apt (0.8.0~pre2) experimental; urgency=
  
   -- 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 ]
@@@ -1495,56 -1222,6 +1763,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 ]
@@@ -2159,152 -1836,6 +2427,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 ]
@@@ -2425,53 -1956,20 +2693,53 @@@ apt (0.7.25.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sat, 09 Jan 2010 21:52:36 +0100
  
 -apt (0.7.25) unstable; urgency=low
 +apt (0.7.25ubuntu4) lucid; urgency=low
  
 -  [ Christian Perrier ]
 -  * Fix apt-ftparchive(1) wrt description of the "-o" option.
 -    Thanks to Dann Frazier for the patch. Closes: #273100
 -  * po/LINGUAS. Re-disable Hebrew. Closes: #534992
 -  * po/LINGUAS. Enable Asturian and Lithuanian
 -  * Fix typo in apt-cache.8.xml: nessasarily
 -  * Fix "with with" in apt-get.8.xml
 -  * Fix some of the typos mentioned by the german team
 -    Closes: #479997
 -  * Polish translation update by Wiktor Wandachowicz
 -    Closes: #548571
 -  * German translation update by Holger Wansing
 +  * 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 ]
 +  * Fix apt-ftparchive(1) wrt description of the "-o" option.
 +    Thanks to Dann Frazier for the patch. Closes: #273100
 +  * po/LINGUAS. Re-disable Hebrew. Closes: #534992
 +  * po/LINGUAS. Enable Asturian and Lithuanian
 +  * Fix typo in apt-cache.8.xml: nessasarily
 +  * Fix "with with" in apt-get.8.xml
 +  * Fix some of the typos mentioned by the german team
 +    Closes: #479997
 +  * Polish translation update by Wiktor Wandachowicz
 +    Closes: #548571
 +  * German translation update by Holger Wansing
      Closes: #551534
    * Italian translation update by Milo Casagrande
      Closes: #555797
@@@ -2601,29 -2099,6 +2869,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 ]
@@@ -2693,59 -2168,6 +2961,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 ]
@@@ -2975,34 -2397,6 +3243,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 ]
@@@ -3046,125 -2440,6 +3314,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 ]
@@@ -3233,12 -2508,6 +3501,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 ]
@@@ -3537,90 -2806,6 +3805,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 ]
@@@ -3847,290 -3032,28 +4115,290 @@@ 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)
 +
 + -- 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
 +    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
  
@@@ -4234,193 -3157,6 +4502,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
@@@ -4448,14 -3184,6 +4716,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 ]
@@@ -4516,90 -3244,6 +4784,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.
@@@ -4693,144 -3337,34 +4961,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
    
@@@ -4861,26 -3395,6 +5129,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.
@@@ -4993,173 -3507,6 +5261,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:
@@@ -5205,37 -3552,6 +5473,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
@@@ -5324,26 -3640,6 +5592,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:
@@@ -5376,38 -3672,6 +5644,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:
@@@ -5431,24 -3695,6 +5699,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:
@@@ -5472,19 -3718,6 +5740,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:  
@@@ -5505,22 -3738,6 +5773,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:
@@@ -5627,80 -3844,6 +5895,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 
@@@ -5710,12 -3853,6 +5978,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
@@@ -5731,39 -3868,6 +5999,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
@@@ -5776,13 -3880,6 +6044,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/control
index 460c550f0be3fe79d4687e58958f6d4e82878b15,d014dfdab1aa8a4c18a3a7b97a2b29ae059ee228..7f9e46ea76105728f787df1985fc605f83461358
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,32 -1,66 +1,69 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
  Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Julian Andres Klode <jak@debian.org>
  Standards-Version: 3.9.2
- Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, gcc-4.6 (>= 4.6.0-6ubuntu2)
+ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev,
+  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), 
+  zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, 
 - po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
++ po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen,
++ gcc-4.6 (>= 4.6.0-6ubuntu2)
  Build-Conflicts: autoconf2.13, automake1.4
  Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
  Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
  
  Package: apt
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
 +Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg
  Replaces: manpages-pl (<< 20060617-3~)
- Provides: ${libapt-pkg:provides}
 +Recommends: ubuntu-keyring
  Conflicts: python-apt (<< 0.7.93.2~)
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
- Description: Advanced front-end for dpkg
-  This is Debian's next generation front-end for the dpkg package manager.
-  It provides the apt-get utility and APT dselect method that provides a 
-  simpler, safer way to install and upgrade packages.
+ Description: APT's commandline package manager
+  This package provides commandline tools for searching and
+  managing as well as querying information about packages
+  as a low-level access to all features of the libapt-pkg library.
   .
-  APT features complete installation ordering, multiple source capability
-  and several other unique features, see the Users Guide in apt-doc.
+  These include:
+   * apt-get for retrieval of packages and information about them
+     from authenticated sources and for installation, upgrade and
+     removal of packages together with their dependencies
+   * apt-cache for querying available information about installed
+     as well as installable packages
+   * apt-cdrom to use removable media as a source for packages
+   * apt-config as an interface to the configuration settings
+   * apt-key as an interface to manage authentication keys
+ 
+ Package: libapt-pkg4.11
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Description: APT's package managment runtime library
+  This library provides the common functionality for searching and
+  managing packages as well as information about packages.
+  Higher-level package managers can depend upon this library.
+  .
+  This includes:
+   * retrieval of information about packages from multiple sources
+   * retrieval of packages and all dependent packages
+     needed to satisfy a request either through an internal
+     solver or by interfacing with an external one
+   * authenticating the sources and validating the retrieved data
+   * installation and removal of packages in the system
+   * providing different transports to retrieve data over cdrom, ftp,
+     http, rsh as well as an interface to add more transports like
+     https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
+ 
+ Package: libapt-inst1.3
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Description: APT's deb package format runtime library
+  This library provides methods to query and extract information 
+  from deb packages. This includes the control data and the package
+  file content.
  
  Package: apt-doc
  Architecture: all
@@@ -34,13 -68,13 +71,13 @@@ Priority: optiona
  Depends: ${misc:Depends}
  Section: doc
  Description: Documentation for APT
-  This package contains the user guide and offline guide, for APT, an
-  Advanced Package Tool.
+  This package contains the user guide and offline guide for various
+  APT tools which are provided in a html and a text-only version.
  
  Package: libapt-pkg-dev
  Architecture: any
  Priority: optional
- Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
+ Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
  Section: libdevel
  Description: Development files for APT's libapt-pkg and libapt-inst
   This package contains the header files and libraries for
@@@ -62,19 -96,25 +99,25 @@@ Description: Documentation for APT deve
  Package: apt-utils
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
- Provides: ${libapt-inst:provides}
  Description: APT utility programs
-  This package contains some APT utility programs such as apt-ftparchive,
-  apt-sortpkgs and apt-extracttemplates.
+  This package contains some less used commandline utilities related
+  to package managment with APT.
   .
-  apt-extracttemplates is used by debconf to prompt for configuration 
-  questions before installation. apt-ftparchive is used to create Package
-  and other index files. apt-sortpkgs is a Package/Source file normalizer.
+   * apt-extracttemplates is used by debconf to prompt for configuration
+     questions before installation.
+   * apt-ftparchive is used to create Packages and other index files
+     needed to publish an archive of debian packages
+   * apt-sortpkgs is a Packages/Sources file normalizer.
  
  Package: apt-transport-https
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Priority: optional
- Description: APT https transport
-  This package contains a APT https transport. It makes it possible to
-  use 'deb https://foo distro main' lines in the sources.list.
+ Description: https download transport for APT
+  This package enables the usage of 'deb https://foo distro main' lines
+  in the /etc/apt/sources.list so that all package managers using the
+  libapt-pkg library can access metadata and packages available in sources
+  accessable over https (Hypertext Transfer Protocol Secure).
+  .
+  This transport supports server as well as client authenification
+  with certificates.

diff --combined debian/rules
index d8e4a88bdaad4f19f10cf1082deb4a27c6db5b94,1446a039ee514f60c99f28f03dfcf95a1e6d6cfc..2cfd95b31cd9f7b7e949418c82cf56c9485631fc
--- 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)
  
@@@ -65,7 -62,7 +65,7 @@@ configure.in
  endif
  
  # APT Programs in apt-utils
- APT_UTILS=ftparchive sortpkgs extracttemplates
+ APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
  
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
@@@ -73,9 -70,9 +73,9 @@@
  # Find the libapt-pkg major version for use in other control files
  include buildlib/libversion.mak
  
- # Determine which package we should provide in the control files
- LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
- LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
+ # Determine which library package names to use
+ LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
+ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
  
  # do not fail as we are just experimenting with symbol files for now
  export DPKG_GENSYMBOLS_CHECK_LEVEL=0
@@@ -100,6 -97,10 +100,10 @@@ build/configure-stamp: configur
  build/build-stamp: build/configure-stamp
        # Add here commands to compile the package.
        $(MAKE) binary
+       # compat symlink for the locale split
+       mkdir -p build/usr/share 
+       cd build/usr/share && ln -f -s ../../locale .
+       # done here
        touch $@
  
  build/build-doc-stamp: build/configure-stamp
@@@ -137,7 -138,7 +141,7 @@@ libapt-pkg-doc: build-do
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+       dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
  
@@@ -165,7 -166,7 +169,7 @@@ apt-doc: build-do
  
  # Build architecture-dependent files here.
  
- binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+ binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
  apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
  apt: build build-doc
        dh_testdir -p$@
@@@ -176,8 -177,6 +180,8 @@@
  # 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
@@@ -187,7 -186,7 +191,7 @@@
        dh_install -p$@ --sourcedir=$(BLD)
  
        # Remove the bits that are in apt-utils
-       rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS))
+       rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
  
        # https has its own package
        rm debian/$@/usr/lib/apt/methods/https
@@@ -207,10 -206,9 +211,9 @@@
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@
-       dh_makeshlibs -p$@
        dh_installdeb -p$@
-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+       dh_shlibdeps -p$@
+       dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
  
@@@ -229,7 -227,7 +232,7 @@@ libapt-pkg-dev: buil
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+       dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST)
        dh_md5sums -p$@
        dh_builddeb -p$@
  
@@@ -241,8 -239,10 +244,10 @@@ apt-utils: buil
        dh_installdirs -p$@
  
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
+       cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
  
        dh_install -p$@ --sourcedir=$(BLD)
+       dh_link -p$@
        dh_installdocs -p$@
        dh_installexamples -p$@
  
@@@ -255,8 -255,46 +260,46 @@@
        dh_fixperms -p$@
        dh_makeshlibs -p$@
        dh_installdeb -p$@
-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-       dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+       dh_shlibdeps -p$@
+       dh_gencontrol -p$@
+       dh_md5sums -p$@
+       dh_builddeb -p$@
+ 
+ $(LIBAPT_PKG): build
+       dh_testdir -p$@
+       dh_testroot -p$@
+       dh_prep -p$@
+       dh_installdirs -p$@
+ 
+       dh_install -p$@ --sourcedir=$(BLD)
+       dh_installdocs -p$@
+       dh_installchangelogs -p$@
+       dh_strip -p$@
+       dh_compress -p$@
+       dh_fixperms -p$@
+       dh_makeshlibs -p$@
+       dh_installdeb -p$@
+       dh_shlibdeps -p$@ 
+       dh_gencontrol -p$@
+       dh_md5sums -p$@
+       dh_builddeb -p$@
+ 
+ $(LIBAPT_INST): build
+       dh_testdir -p$@
+       dh_testroot -p$@
+       dh_prep -p$@
+       dh_installdirs -p$@
+ 
+       dh_install -p$@ --sourcedir=$(BLD)
+       dh_installdocs -p$@
+       dh_installchangelogs -p$@
+       dh_strip -p$@
+       dh_compress -p$@
+       dh_fixperms -p$@
+       dh_makeshlibs -p$@
+       dh_installdeb -p$@
+       dh_shlibdeps -p$@ 
+       dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
  
@@@ -278,7 -316,7 +321,7 @@@ apt-transport-https: build libapt-pkg-d
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+       dh_shlibdeps -p$@ 
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@