* Merged from the mvo branch

* merged from the lp:~mvo/apt/history branch
* 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
* Simplified Chinese translation update by Aron Xu
  Closes: #558737
* Slovak translation update by Ivan Masár
  Closes: #559277
* 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 (Closes: #518473)
  (thanks also to Jussi Hakala and Julian Andres Klode)
* apt-pkg/deb/dpkgpm.cc:
  - add "purge" to list of known actions
* apt-pkg/init.h:
  - add compatibility with old ABI name until the next ABI break
* merge segfault fix from Mario Sanchez Prada, many thanks
  (closes: #561109)
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
  - typo fix (LP: #462328)

* cmdline/apt-key:
  - Emit a warning if removed keys keyring is missing and skip associated
    checks (LP: #218971)
* apt-pkg/packagemanager.cc:
  - better debug output for ImmediateAdd with depth and why
  - improve the message shown for failing immediate configuration
* doc/guide.it.sgml: moved to doc/it/guide.it.sgml
* doc/po4a.conf: activate translation of guide.sgml and offline.sgml
* doc/apt.conf.5.xml:
  - provide a few more details about APT::Immediate-Configure
  - briefly document the behaviour of the new https options
* doc/sources.list.5.xml:
  - add note about additional apt-transport-methods
* doc/apt-mark.8.xml:
  - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
* cmdline/apt-get.cc:
  - source should display his final pkg pick (Closes: #249383, #550952)
  - source doesn't need the complete version for match (Closes: #245250)
  - source ignores versions/releases if not available (Closes: #377424)
  - only warn if (free) space overflows (Closes: #522238)
  - add --debian-only as alias for --diff-only
* methods/connect.cc:
  - display also strerror of "wicked" getaddrinfo errors
  - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
    in response to Bernhard R. Link, thanks! (Closes: #505020)
* buildlib/configure.mak, buildlib/config.{sub,guess}:
  - remove (outdated) config.{sub,guess} and use the ones provided
    by the new added build-dependency autotools-dev instead
* configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
  - remove the now obsolete manpage buildsystems
* doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
  - convert all remaining translation to the po4a system
* debian/control:
  - drop build-dependency on docbook-utils and xmlto
  - add build-dependency on autotools-dev
  - bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
  - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
* ftparchive/writer.{cc,h}:
  - add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
  - use "diff" filetype for .debian.tar.* files (Closes: #554898)
* methods/rred.cc:
  - rewrite to be able to handle even big patch files
  - adopt optional mmap+iovec patch from Morten Hustveit
    (Closes: #463354) which should speed up a bit. Thanks!
* methods/http{,s}.cc
  - add config setting for User-Agent to the Acquire group,
    thanks Timothy J. Miller! (Closes: #355782)
  - add https options which default to http ones (Closes: #557085)
* debian/apt.cron.daily:
  - check cache size even if we do nothing else otherwise, thanks
    Francesco Poli for patch(s) and patience! (Closes: #459344)
* ftparchive/*:
  - fix a few typos in strings, comments and manpage,
    thanks Karl Goetz! (Closes: #558757)
* cmdline/apt-mark:
  - print an error if a new state file can't be created
    (Closes: #521289) and
  - exit nicely if python-apt is not installed (Closes: #521284)
* doc/de: German translation of manpages (Closes: #552606)
* doc/ various manpages:
  - correct various errors, typos and oddities (Closes: #552535)
* doc/apt-secure.8.xml:
  - replace literal with emphasis tags in Archive configuration
* doc/apt-ftparchive.1.xml:
  - remove informalexample tag which hides the programlisting
* doc/apt-get.8.xml:
  - change equivalent "for" to "to the" (purge command)
  - clarify --fix-broken sentence about specifying packages
* apt-pkg/contib/strutl.h
  - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
* build infrastructure:
  - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
* doc/apt.conf.5.xml:
  - Deprecate unquoted values, string concatenation and explain what should
    not be written inside a value (quotes,backslash).
  - Restrict option names to alphanumerical characters and "/-:._+".
  - Deprecate #include, we have apt.conf.d nowadays which should be
    sufficient.
* ftparchive/apt-ftparchive.cc:
  - Call setlocale() so translations are actually used.
* debian/apt.conf.autoremove:
  - Add kfreebsd-image-* to the list (Closes: #558803)

diff --combined apt-pkg/deb/dpkgpm.cc
index 332b3cf0bb58f827b99c26909d6ad9c3dcb80e6d,88098c379c6d6aca1d4b96ea8d0dbb1947b9c14a..2f84a5a879557955ad73a5b6a95efd767c8df516
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -12,7 -12,6 +12,7 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/depcache.h>
 +#include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/strutl.h>
  #include <apti18n.h>
  #include <apt-pkg/fileutl.h>
@@@ -25,7 -24,6 +25,7 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 +#include <string.h>
  #include <stdio.h>
  #include <string.h>
  #include <algorithm>
@@@ -51,6 -49,7 +51,7 @@@ namespac
      std::make_pair("install",   N_("Installing %s")),
      std::make_pair("configure", N_("Configuring %s")),
      std::make_pair("remove",    N_("Removing %s")),
+     std::make_pair("purge",    N_("Completely removing %s")),
      std::make_pair("trigproc",  N_("Running post-installation trigger %s"))
    };
  
@@@ -106,7 -105,7 +107,7 @@@ ionice(int PID
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
     : pkgPackageManager(Cache), dpkgbuf_pos(0),
 -     term_out(NULL), PackagesDone(0), PackagesTotal(0)
 +     term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0)
  {
  }
                                                                        /*}}}*/
@@@ -342,6 -341,7 +343,6 @@@ bool pkgDPkgPM::RunScriptsWithPkgs(cons
  
     return true;
  }
 -
                                                                        /*}}}*/
  // DPkgPM::DoStdin - Read stdin and pass to slave pty                 /*{{{*/
  // ---------------------------------------------------------------------
@@@ -411,7 -411,7 +412,7 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i
        'processing: trigproc: trigger'
            
     */
 -   char* list[5];
 +   char* list[6];
     //        dpkg sends multiline error messages sometimes (see
     //        #374195 for a example. we should support this by
     //        either patching dpkg to not send multiline over the
@@@ -459,14 -459,6 +460,14 @@@
  
     if(strncmp(action,"error",strlen("error")) == 0)
     {
 +      // urgs, sometime has ":" in its error string so that we
 +      // end up with the error message split between list[3]
 +      // and list[4], e.g. the message: 
 +      // "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..."
 +      // concat them again
 +      if( list[4] != NULL )
 +       list[3][strlen(list[3])] = ':';
 +
        status << "pmerror:" << list[1]
             << ":"  << (PackagesDone/float(PackagesTotal)*100.0) 
             << ":" << list[3]
@@@ -475,8 -467,6 +476,8 @@@
         write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
         std::clog << "send: '" << status.str() << "'" << endl;
 +      pkgFailures++;
 +      WriteApportReport(list[1], list[3]);
        return;
     }
     else if(strncmp(action,"conffile",strlen("conffile")) == 0)
@@@ -560,45 -550,103 +561,103 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat
     dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
  }
                                                                        /*}}}*/
+ // DPkgPM::WriteHistoryTag                                            /*{{{*/
+ void pkgDPkgPM::WriteHistoryTag(string tag, string value)
+ {
+    if (value.size() > 0)
+    {
+       // poor mans rstrip(", ")
+       if (value[value.size()-2] == ',' && value[value.size()-1] == ' ')
+        value.erase(value.size() - 2, 2);
+       fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str());
+    }
+ }                                                                     /*}}}*/
  // DPkgPM::OpenLog                                                    /*{{{*/
  bool pkgDPkgPM::OpenLog()
  {
     string logdir = _config->FindDir("Dir::Log");
     if(not FileExists(logdir))
        return _error->Error(_("Directory '%s' missing"), logdir.c_str());
+ 
+    // get current time
+    char timestr[200];
+    time_t t = time(NULL);
+    struct tm *tmp = localtime(&t);
+    strftime(timestr, sizeof(timestr), "%F  %T", tmp);
+ 
+    // open terminal log
     string logfile_name = flCombine(logdir,
                                   _config->Find("Dir::Log::Terminal"));
     if (!logfile_name.empty())
     {
        term_out = fopen(logfile_name.c_str(),"a");
        chmod(logfile_name.c_str(), 0600);
-       // output current time
-       char outstr[200];
-       time_t t = time(NULL);
-       struct tm *tmp = localtime(&t);
-       strftime(outstr, sizeof(outstr), "%F  %T", tmp);
-       fprintf(term_out, "\nLog started: ");
-       fprintf(term_out, "%s", outstr);
+       fprintf(term_out, "\n\nLog started: ");
+       fprintf(term_out, "%s", timestr);
        fprintf(term_out, "\n");
     }
+ 
+    // write 
+    string history_name = flCombine(logdir,
+                                  _config->Find("Dir::Log::History"));
+    if (!history_name.empty())
+    {
+       history_out = fopen(history_name.c_str(),"a");
+       chmod(history_name.c_str(), 0644);
+       fprintf(history_out, "\nStart-Date: %s\n", timestr);
+       string remove, purge, install, upgrade, downgrade;
+       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+       {
+        if (Cache[I].NewInstall())
+           install += I.Name() + string(" (") + Cache[I].CandVersion + string("), ");
+        else if (Cache[I].Upgrade())
+           upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
+        else if (Cache[I].Downgrade())
+           downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
+        else if (Cache[I].Delete())
+        {
+           if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
+              purge += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");      
+           else
+              remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
+        }
+       }
+       WriteHistoryTag("Install", install);
+       WriteHistoryTag("Upgrade", upgrade);
+       WriteHistoryTag("Downgrade",downgrade);
+       WriteHistoryTag("Remove",remove);
+       WriteHistoryTag("Purge",purge);
+       fflush(history_out);
+    }
+    
     return true;
  }
                                                                        /*}}}*/
  // DPkg::CloseLog                                                     /*{{{*/
  bool pkgDPkgPM::CloseLog()
  {
+    char timestr[200];
+    time_t t = time(NULL);
+    struct tm *tmp = localtime(&t);
+    strftime(timestr, sizeof(timestr), "%F  %T", tmp);
+ 
     if(term_out)
     {
-       char outstr[200];
-       time_t t = time(NULL);
-       struct tm *tmp = localtime(&t);
-       strftime(outstr, sizeof(outstr), "%F  %T", tmp);
        fprintf(term_out, "Log ended: ");
-       fprintf(term_out, "%s", outstr);
+       fprintf(term_out, "%s", timestr);
        fprintf(term_out, "\n");
        fclose(term_out);
     }
     term_out = NULL;
+ 
+    if(history_out)
+    {
+       if (dpkg_error.size() > 0)
+        fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
+       fprintf(history_out, "End-Date: %s\n", timestr);
+       fclose(history_out);
+    }
+ 
     return true;
  }
                                                                        /*}}}*/
@@@ -889,7 -937,8 +948,8 @@@ bool pkgDPkgPM::Go(int OutStatusFd
            const char *s = _("Can not write log, openpty() "
                              "failed (/dev/pts not mounted?)\n");
            fprintf(stderr, "%s",s);
-           fprintf(term_out, "%s",s);
+             if(term_out)
+               fprintf(term_out, "%s",s);
            master = slave = -1;
         }  else {
            struct termios rtt;
@@@ -1010,6 -1059,7 +1070,6 @@@
            signal(SIGHUP,old_SIGHUP);
            return _error->Errno("waitpid","Couldn't wait for subprocess");
         }
 -
         // wait for input or output here
         FD_ZERO(&rfds);
         if (!stdin_is_dev_null)
@@@ -1066,11 -1116,14 +1126,14 @@@
            RunScripts("DPkg::Post-Invoke");
  
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
-           _error->Error("Sub-process %s received a segmentation fault.",Args[0]);
+           strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
         else if (WIFEXITED(Status) != 0)
-           _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+           strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
         else 
-           _error->Error("Sub-process %s exited unexpectedly",Args[0]);
+           strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+ 
+        if(dpkg_error.size() > 0)
+           _error->Error(dpkg_error.c_str());
  
         if(stopOnError) 
         {
@@@ -1096,186 -1149,3 +1159,186 @@@ void pkgDPkgPM::Reset(
     List.erase(List.begin(),List.end());
  }
                                                                        /*}}}*/
 +// pkgDpkgPM::WriteApportReport - write out error report pkg failure  /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) 
 +{
 +   string pkgname, reportfile, srcpkgname, pkgver, arch;
 +   string::size_type pos;
 +   FILE *report;
 +
 +   if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
 +   {
 +      std::clog << "configured to not write apport reports" << std::endl;
 +      return;
 +   }
 +
 +   // only report the first errors
 +   if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3))
 +   {
 +      std::clog << _("No apport report written because MaxReports is reached already") << std::endl;
 +      return;
 +   }
 +
 +   // check if its not a follow up error 
 +   const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured");
 +   if(strstr(errormsg, needle) != NULL) {
 +      std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl;
 +      return;
 +   }
 +
 +   // do not report disk-full failures 
 +   if(strstr(errormsg, strerror(ENOSPC)) != NULL) {
 +      std::clog << _("No apport report written because the error message indicates a disk full error") << std::endl;
 +      return;
 +   }
 +
 +   // do not report out-of-memory failures 
 +   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
 +      std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
 +      return;
 +   }
 +
 +   // do not report dpkg I/O errors
 +   // XXX - this message is localized, but this only matches the English version.  This is better than nothing.
 +   if(strstr(errormsg, "short read in buffer_copy (")) {
 +      std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +      return;
 +   }
 +
 +   // get the pkgname and reportfile
 +   pkgname = flNotDir(pkgpath);
 +   pos = pkgname.find('_');
 +   if(pos != string::npos)
 +      pkgname = pkgname.substr(0, pos);
 +
 +   // find the package versin and source package name
 +   pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname);
 +   if (Pkg.end() == true)
 +      return;
 +   pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
 +   if (Ver.end() == true)
 +      return;
 +   pkgver = Ver.VerStr() == NULL ? "unknown" : Ver.VerStr();
 +   pkgRecords Recs(Cache);
 +   pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
 +   srcpkgname = Parse.SourcePkg();
 +   if(srcpkgname.empty())
 +      srcpkgname = pkgname;
 +
 +   // if the file exists already, we check:
 +   // - if it was reported already (touched by apport). 
 +   //   If not, we do nothing, otherwise
 +   //    we overwrite it. This is the same behaviour as apport
 +   // - if we have a report with the same pkgversion already
 +   //   then we skip it
 +   reportfile = flCombine("/var/crash",pkgname+".0.crash");
 +   if(FileExists(reportfile))
 +   {
 +      struct stat buf;
 +      char strbuf[255];
 +
 +      // check atime/mtime
 +      stat(reportfile.c_str(), &buf);
 +      if(buf.st_mtime > buf.st_atime)
 +       return;
 +
 +      // check if the existing report is the same version
 +      report = fopen(reportfile.c_str(),"r");
 +      while(fgets(strbuf, sizeof(strbuf), report) != NULL)
 +      {
 +       if(strstr(strbuf,"Package:") == strbuf)
 +       {
 +          char pkgname[255], version[255];
 +          if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2)
 +             if(strcmp(pkgver.c_str(), version) == 0)
 +             {
 +                fclose(report);
 +                return;
 +             }
 +       }
 +      }
 +      fclose(report);
 +   }
 +
 +   // now write the report
 +   arch = _config->Find("APT::Architecture");
 +   report = fopen(reportfile.c_str(),"w");
 +   if(report == NULL)
 +      return;
 +   if(_config->FindB("DPkgPM::InitialReportOnly",false) == true)
 +      chmod(reportfile.c_str(), 0);
 +   else
 +      chmod(reportfile.c_str(), 0600);
 +   fprintf(report, "ProblemType: Package\n");
 +   fprintf(report, "Architecture: %s\n", arch.c_str());
 +   time_t now = time(NULL);
 +   fprintf(report, "Date: %s" , ctime(&now));
 +   fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str());
 +   fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str());
 +   fprintf(report, "ErrorMessage:\n %s\n", errormsg);
 +
 +   // ensure that the log is flushed
 +   if(term_out)
 +      fflush(term_out);
 +
 +   // attach terminal log it if we have it
 +   string logfile_name = _config->FindFile("Dir::Log::Terminal");
 +   if (!logfile_name.empty())
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "DpkgTerminalLog:\n");
 +      log = fopen(logfile_name.c_str(),"r");
 +      if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +       fclose(log);
 +      }
 +   }
 +
 +   // log the ordering 
 +   const char *ops_str[] = {"Install", "Configure","Remove","Purge"};
 +   fprintf(report, "AptOrdering:\n");
 +   for (vector<Item>::iterator I = List.begin(); I != List.end(); I++)
 +      fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
 +
 +   // attach dmesg log (to learn about segfaults)
 +   if (FileExists("/bin/dmesg"))
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "Dmesg:\n");
 +      log = popen("/bin/dmesg","r");
 +      if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +       fclose(log);
 +      }
 +   }
 +
 +   // attach df -l log (to learn about filesystem status)
 +   if (FileExists("/bin/df"))
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "Df:\n");
 +      log = popen("/bin/df -l","r");
 +      if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +       fclose(log);
 +      }
 +   }
 +
 +   fclose(report);
 +
 +}
 +                                                                      /*}}}*/

diff --combined apt-pkg/deb/dpkgpm.h
index 90e5b95e6c5ca303fb9bb752ab84f98c0f05359c,330c788a25319fc74e5cea393946bebfe49b893f..ce3e20f2e91e57b9620855d4e6044928cecd9423
--- 1/apt-pkg/deb/dpkgpm.h
--- 2/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@@ -29,9 -29,10 +29,11 @@@ class pkgDPkgPM : public pkgPackageMana
     char dpkgbuf[1024];
     int dpkgbuf_pos;
     FILE *term_out;
-    
+    FILE *history_out;
+    string dpkg_error;
+ 
     protected:
 +   int pkgFailures;
  
     // progress reporting
     struct DpkgState 
@@@ -48,7 -49,6 +50,7 @@@
     // the int is the state that is already done (e.g. a package that is
     // going to be install is already in state "half-installed")
     map<string,unsigned int> PackageOpsDone;
 +
     // progress reporting
     unsigned int PackagesDone;
     unsigned int PackagesTotal;
@@@ -68,10 -68,8 +70,11 @@@
     // Helpers
     bool RunScriptsWithPkgs(const char *Cnf);
     bool SendV2Pkgs(FILE *F);
+    void WriteHistoryTag(string tag, string value);
  
 +   // apport integration
 +   void WriteApportReport(const char *pkgpath, const char *errormsg);
 +
     // dpkg log
     bool OpenLog();
     bool CloseLog();

diff --combined apt-pkg/init.cc
index 6f02203cd365cfd6844e2d94835326b739baf81b,2544b8025a8218d3584f2f1ca2853ebb38a02c35..67d321abf4961688b4b22e04f0cafc076e85573b
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -51,7 -51,6 +51,7 @@@ bool pkgInitConfig(Configuration &Cnf
         
     Cnf.Set("Dir::State::lists","lists/");
     Cnf.Set("Dir::State::cdroms","cdroms.list");
 +   Cnf.Set("Dir::State::mirrors","mirrors/");
     
     // Cache
     Cnf.Set("Dir::Cache","var/cache/apt/");
@@@ -75,7 -74,8 +75,8 @@@
     // State   
     Cnf.Set("Dir::Log","var/log/apt");
     Cnf.Set("Dir::Log::Terminal","term.log");
-    
+    Cnf.Set("Dir::Log::History","history.log");
+ 
     // Translation
     Cnf.Set("APT::Acquire::Translation", "environment");
  

diff --combined cmdline/apt-get.cc
index 8f295ee40ffb1aba1d6931914891532a67198979,f84c82d283d1de099c0b27d8fa8bed9f8a3b571f..a5a48cf2f0b70f8acd6a3dc123f90ec027ef33b7
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -862,10 -862,14 +862,14 @@@ bool InstallPackages(CacheFile &Cache,b
     {
        struct statvfs Buf;
        string OutputDir = _config->FindDir("Dir::Cache::Archives");
-       if (statvfs(OutputDir.c_str(),&Buf) != 0)
-        return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-                             OutputDir.c_str());
-       if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+       if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+        if (errno == EOVERFLOW)
+           return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+                                OutputDir.c_str());
+        else
+           return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+                                OutputDir.c_str());
+       } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
        {
           struct statfs Stat;
           if (statfs(OutputDir.c_str(),&Stat) != 0
@@@ -1243,136 -1247,142 +1247,142 @@@ pkgSrcRecords::Parser *FindSrc(const ch
                               pkgSrcRecords &SrcRecs,string &Src,
                               pkgDepCache &Cache)
  {
-    // We want to pull the version off the package specification..
     string VerTag;
-    string DefRel;
+    string DefRel = _config->Find("APT::Default-Release");
     string TmpSrc = Name;
-    const size_t found = TmpSrc.find_last_of("/=");
  
-    // honor default release
-    if (found != string::npos && TmpSrc[found] == '/')
-    {
-       DefRel = TmpSrc.substr(found+1);
+    // extract the version/release from the pkgname
+    const size_t found = TmpSrc.find_last_of("/=");
+    if (found != string::npos) {
+       if (TmpSrc[found] == '/')
+        DefRel = TmpSrc.substr(found+1);
+       else
+        VerTag = TmpSrc.substr(found+1);
        TmpSrc = TmpSrc.substr(0,found);
     }
-    else
-       DefRel = _config->Find("APT::Default-Release");
  
-    pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
- 
-    if (found != string::npos && TmpSrc[found] == '=')
+    /* Lookup the version of the package we would install if we were to
+       install a version and determine the source package name, then look
+       in the archive for a source package of the same name. */
+    bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+    const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+    if (MatchSrcOnly == false && Pkg.end() == false) 
     {
-       VerTag = TmpSrc.substr(found+1);
-       TmpSrc = TmpSrc.substr(0,found);
-    } 
-    else  if(!Pkg.end() && DefRel.empty() == false)
-    {
-       // we have a default release, try to locate the pkg. we do it like
-       // this because GetCandidateVer() will not "downgrade", that means
-       // "apt-get source -t stable apt" won't work on a unstable system
-       for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; 
-          Ver++)
+       if(VerTag.empty() == false || DefRel.empty() == false) 
        {
-        for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
-             VF++)
+        // we have a default release, try to locate the pkg. we do it like
+        // this because GetCandidateVer() will not "downgrade", that means
+        // "apt-get source -t stable apt" won't work on a unstable system
+        for (pkgCache::VerIterator Ver = Pkg.VersionList();
+             Ver.end() == false; Ver++) 
         {
-           /* If this is the status file, and the current version is not the
-              version in the status file (ie it is not installed, or somesuch)
-              then it is not a candidate for installation, ever. This weeds
-              out bogus entries that may be due to config-file states, or
-              other. */
-           if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 
-               pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
-           continue;
-           
-           if((VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
-               (VF.File().Codename() != 0 && VF.File().Codename() == DefRel))
+           for (pkgCache::VerFileIterator VF = Ver.FileList();
+                VF.end() == false; VF++) 
            {
-              pkgRecords::Parser &Parse = Recs.Lookup(VF);
-              VerTag = Parse.SourceVer();
-              if (VerTag.empty())
-                 VerTag = Ver.VerStr();
-              break;
+              /* If this is the status file, and the current version is not the
+                 version in the status file (ie it is not installed, or somesuch)
+                 then it is not a candidate for installation, ever. This weeds
+                 out bogus entries that may be due to config-file states, or
+                 other. */
+              if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+                  pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+                 continue;
+ 
+              // We match against a concrete version (or a part of this version)
+              if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
+                 continue;
+ 
+              // or we match against a release
+              if(VerTag.empty() == false ||
+                 (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
+                 (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) 
+              {
+                 pkgRecords::Parser &Parse = Recs.Lookup(VF);
+                 Src = Parse.SourcePkg();
+                 if (VerTag.empty() == true)
+                    VerTag = Parse.SourceVer();
+                 break;
+              }
            }
         }
+        if (Src.empty() == true) 
+        {
+           if (VerTag.empty() == false)
+              _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+           else
+              _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+           VerTag.clear();
+           DefRel.clear();
+        }
        }
-    }
- 
-    /* Lookup the version of the package we would install if we were to
-       install a version and determine the source package name, then look
-       in the archive for a source package of the same name. */
-    bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
-    if (MatchSrcOnly == false)
-    {
-       if (Pkg.end() == false)
+       if (VerTag.empty() == true && DefRel.empty() == true) 
        {
+        // if we don't have a version or default release, use the CandidateVer to find the Source
         pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
-        if (Ver.end() == false)
+        if (Ver.end() == false) 
         {
            pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
            Src = Parse.SourcePkg();
+           VerTag = Parse.SourceVer();
         }
-       }   
+       }
+    }
+ 
+    if (Src.empty() == true)
+       Src = TmpSrc;
+    else 
+    {
+       /* if we have a source pkg name, make sure to only search
+        for srcpkg names, otherwise apt gets confused if there
+        is a binary package "pkg1" and a source package "pkg1"
+        with the same name but that comes from different packages */
+       MatchSrcOnly = true;
+       if (Src != TmpSrc) 
+       {
+        ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+       }
     }
  
     // The best hit
     pkgSrcRecords::Parser *Last = 0;
     unsigned long Offset = 0;
     string Version;
-    bool IsMatch = false;
  
-    // No source package name..
-    if (Src.empty() == true)
-       Src = TmpSrc;
-    else 
-       // if we have a source pkg name, make sure to only search
-       // for srcpkg names, otherwise apt gets confused if there
-       // is a binary package "pkg1" and a source package "pkg1"
-       // with the same name but that comes from different packages
-       MatchSrcOnly = true;
-    
-    // If we are matching by version then we need exact matches to be happy
-    if (VerTag.empty() == false)
-       IsMatch = true;
-    
     /* Iterate over all of the hits, which includes the resulting
        binary packages in the search */
     pkgSrcRecords::Parser *Parse;
-    SrcRecs.Restart();
-    while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
+    while (true) 
     {
-       string Ver = Parse->Version();
- 
-       // show name mismatches
-       if (IsMatch == true && Parse->Package() != Src)       
-        ioprintf(c1out,  _("No source package '%s' picking '%s' instead\n"), Src.c_str(), Parse->Package().c_str());
-       
-       if (VerTag.empty() == false)
+       SrcRecs.Restart();
+       while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) 
        {
-        /* Don't want to fall through because we are doing exact version 
-           matching. */
-        if (Cache.VS().CmpVersion(VerTag,Ver) != 0)
+        const string Ver = Parse->Version();
+ 
+        // Ignore all versions which doesn't fit
+        if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
            continue;
-        
-        Last = Parse;
-        Offset = Parse->Offset();
-        break;
+ 
+        // Newer version or an exact match? Save the hit
+        if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+           Last = Parse;
+           Offset = Parse->Offset();
+           Version = Ver;
+        }
+ 
+        // was the version check above an exact match? If so, we don't need to look further
+        if (VerTag.empty() == false && VerTag.size() == Ver.size())
+           break;
        }
-                                 
-       // Newer version or an exact match
-       if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0 || 
-         (Parse->Package() == Src && IsMatch == false))
-       {
-        IsMatch = Parse->Package() == Src;
-        Last = Parse;
-        Offset = Parse->Offset();
-        Version = Ver;
-       }      
+       if (Last != 0 || VerTag.empty() == true)
+        break;
+       //if (VerTag.empty() == false && Last == 0)
+       _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+       VerTag.clear();
     }
-    
+ 
     if (Last == 0 || Last->Jump(Offset) == false)
        return 0;
-    
+ 
     return Last;
  }
                                                                        /*}}}*/
@@@ -2167,33 -2177,6 +2177,33 @@@ bool DoSource(CommandLine &CmdL
        if (Last == 0)
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
        
 +      string srec = Last->AsStr();
 +      string::size_type pos = srec.find("\nVcs-");
 +      while (pos != string::npos)
 +      {
 +       pos += strlen("\nVcs-");
 +       string vcs = srec.substr(pos,srec.find(":",pos)-pos);
 +       if(vcs == "Browser") 
 +       {
 +          pos = srec.find("\nVcs-", pos);
 +          continue;
 +       }
 +       pos += vcs.length()+2;
 +       string::size_type epos = srec.find("\n", pos);
 +       string uri = srec.substr(pos,epos-pos).c_str();
 +       ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in "
 +                         "the '%s' version control system at:\n"
 +                         "%s\n"),
 +                Src.c_str(), vcs.c_str(), uri.c_str());
 +       if(vcs == "Bzr") 
 +          ioprintf(c1out,_("Please use:\n"
 +                           "bzr get %s\n"
 +                           "to retrieve the latest (possibly unreleased) "
 +                           "updates to the package.\n"),
 +                   uri.c_str());
 +       break;
 +      }
 +
        // Back track
        vector<pkgSrcRecords::File> Lst;
        if (Last->Files(Lst) == false)
@@@ -2261,10 -2244,14 +2271,14 @@@
     // Check for enough free space
     struct statvfs Buf;
     string OutputDir = ".";
-    if (statvfs(OutputDir.c_str(),&Buf) != 0)
-       return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-                          OutputDir.c_str());
-    if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+    if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+       if (errno == EOVERFLOW)
+        return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+                               OutputDir.c_str());
+       else
+        return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+                               OutputDir.c_str());
+    } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
       {
         struct statfs Stat;
         if (statfs(OutputDir.c_str(),&Stat) != 0
@@@ -2824,6 -2811,7 +2838,7 @@@ int main(int argc,const char *argv[]
        {0,"force-yes","APT::Get::force-yes",0},
        {0,"print-uris","APT::Get::Print-URIs",0},
        {0,"diff-only","APT::Get::Diff-Only",0},
+       {0,"debian-only","APT::Get::Diff-Only",0},
        {0,"tar-only","APT::Get::Tar-Only",0},
        {0,"dsc-only","APT::Get::Dsc-Only",0},
        {0,"purge","APT::Get::Purge",0},
@@@ -2846,6 -2834,7 +2861,6 @@@
                                     {"remove",&DoInstall},
                                     {"purge",&DoInstall},
                                   {"autoremove",&DoInstall},
 -                                 {"purge",&DoInstall},
                                     {"dist-upgrade",&DoDistUpgrade},
                                     {"dselect-upgrade",&DoDSelectUpgrade},
                                   {"build-dep",&DoBuildDep},

diff --combined debian/apt.cron.daily
index 9afc553ae31a145e253828eff671bfd2a6ffc549,e59b05ee484534bb0d74bb59718f8cf7fdba1593..aa7b188860676cb3f44a13ba098ca7fc305133d5
--- 1/debian/apt.cron.daily
--- 2/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@@ -1,6 -1,4 +1,6 @@@
  #!/bin/sh
 +#
 +
  #set -e
  #
  # This file understands the following apt configuration variables:
@@@ -49,7 -47,7 +49,7 @@@
  #  APT::Periodic::Update-Package-Lists "0";
  #  - Do "apt-get update" automatically every n-days (0=disable)
  #    
 -#  APT::Periodic::Download-Upgradeable-Packages "0";
 +#  "APT::Periodic::Download-Upgradeable-Packages=0",
  #  - Do "apt-get upgrade --download-only" every n-days (0=disable)
  #
  #  APT::Periodic::Download-Upgradeable-Packages-Debdelta "1";
@@@ -61,21 -59,15 +61,21 @@@
  #    Requires the package "unattended-upgrades" and will write
  #    a log in /var/log/unattended-upgrades
  # 
 -#  APT::Periodic::AutocleanInterval "0";
 -#  - Do "apt-get autoclean" every n-days (0=disable)
 +#  "APT::Archives::MaxAge",
 +#  - Set maximum allowed age of a cache package file. If a cache 
 +#    package file is older it is deleted (0=disable)
  #
 -#  APT::Periodic::Verbose "0";
 -#  - Send report mail to root
 -#      0:  no report             (or null string)
 -#      1:  progress report       (actually any string)
 -#      2:  + command outputs     (remove -qq, remove 2>/dev/null, add -d)
 -#      3:  + trace on            
 +#  "APT::Archives::MaxSize",
 +#  - Set maximum size of the cache in MB (0=disable). If the cache
 +#    is bigger, cached package files are deleted until the size
 +#    requirement is met (the biggest packages will be deleted 
 +#    first).
 +#
 +#  "APT::Archives::MinAge"
 +#  - Set minimum age of a package file. If a file is younger it
 +#    will not be deleted (0=disable). Usefull to prevent races 
 +#    and to keep backups of the packages for emergency.
 +# 
  
  check_stamp()
  {
@@@ -116,17 -108,9 +116,17 @@@
  
      delta=$(($now-$stamp))
  
 -    # intervall is in days, convert to sec.
 +    # intervall is in days,
      interval=$(($interval*60*60*24))
 -    debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)"
 +    #echo "stampfile: $1"
 +    #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta"
 +
 +    # remove timestamps a day (or more) in the future and force re-check
 +    if [ $stamp -gt $(($now+86400)) ]; then
 +         echo "WARNING: file $stamp_file has a timestamp in the future: $stamp"
 +         rm -f "$stamp_file"
 +         return 0
 +    fi
  
      # remove timestamps a day (or more) in the future and force re-check
      if [ $stamp -gt $(($now+86400)) ]; then
@@@ -145,7 -129,6 +145,7 @@@
  update_stamp()
  {
      stamp="$1"
 +
      touch $stamp
  }
  
@@@ -401,10 -384,11 +401,10 @@@ now=$(date +%s
  # Document only Periodic for all controling parameters of this script.
  
  UpdateInterval=0
 -eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists)
 -
  DownloadUpgradeableInterval=0
 -eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
 -
 +eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
 +AutocleanInterval=$DownloadUpgradeableInterval
 +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval)
  UnattendedUpgradeInterval=0
  eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
  
@@@ -417,26 -401,19 +417,30 @@@ eval $(apt-config shell BackupArchiveIn
  Debdelta=1
  eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta)
  
- # check if we actually have to do anything
+ # check if we actually have to do anything that requires locking the cache
  if [ $UpdateInterval -eq 0 ] &&
     [ $DownloadUpgradeableInterval -eq 0 ] &&
     [ $UnattendedUpgradeInterval -eq 0 ] &&
 -   [ $BackupArchiveInterval -eq 0 ] &&
     [ $AutocleanInterval -eq 0 ]; then
+ 
+     # check cache size
+     check_size_constraints
+ 
      exit 0
  fi
  
 +# set the proxy based on the admin users gconf settings
 +admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
 +if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then
 +       use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null)
 +       host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null)
 +       port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null)
 +       if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
 +               export http_proxy="http://$host:$port/"
 +       fi
 +fi
 +
 +
  # deal with BackupArchiveInterval
  do_cache_backup $BackupArchiveInterval
  
@@@ -448,13 -425,7 +452,13 @@@ random_slee
  UPDATED=0
  UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
  if check_stamp $UPDATE_STAMP $UpdateInterval; then
 -    if eval apt-get $XAPTOPT -y update $XSTDERR; then
 +    # check for a new archive signing key (against the master keyring)
 +    if eval apt-key net-update $XSTDERR; then
 +      debug_echo "apt-key net-update (success)"
 +    else
 +      debug_echo "apt-key net-update (failure)"
 +    fi
 +    if eval apt-get $XAPTOPT -y update -o APT::Update::Auth-Failure::=\"cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/\" $XSTDERR; then
        debug_echo "download updated metadata (success)."
        if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
            if dbus-send --system / app.apt.dbus.updated boolean:true ; then
@@@ -467,11 -438,6 +471,11 @@@
        fi
        update_stamp $UPDATE_STAMP
        UPDATED=1
 +      # now run apt-xapian-index if it is installed to ensure the index
 +      # is up-to-date
 +      if [ -x /usr/sbin/update-apt-xapian-index ]; then
 +          ionice -c3 update-apt-xapian-index -q
 +      fi
      else
        debug_echo "download updated metadata (error)"
      fi

diff --combined debian/changelog
index 41ed03a0cb20ab00dad711c70402beafd77805fb,eb50b4c78ea76edeefac897ba4d95f4d78c3ed79..6fb5d6a156182a90be81793de7fc7b538c5cd40f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,154 +1,176 @@@
 -apt (0.7.25.1) UNRELEASED; urgency=low
++apt (0.7.25ubuntu1) UNRELEASED; urgency=low
+ 
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
++  * Merged from the mvo branch
++  * merged from the lp:~mvo/apt/history branch
+ 
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 17:01:25 +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
+   * Simplified Chinese translation update by Aron Xu 
+     Closes: #558737
+   * Slovak translation update by Ivan Masár
+     Closes: #559277
+   
+   [ Michael Vogt ]
+   * 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 (Closes: #518473)
+     (thanks also to Jussi Hakala and Julian Andres Klode)
+   * apt-pkg/deb/dpkgpm.cc:
+     - add "purge" to list of known actions
+   * apt-pkg/init.h:
+     - add compatibility with old ABI name until the next ABI break
+   * merge segfault fix from Mario Sanchez Prada, many thanks
+     (closes: #561109)
+ 
+   [ Brian Murray ]
+   * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+     - typo fix (LP: #462328)
+   
+   [ Loïc Minier ]
+   * cmdline/apt-key:
+     - Emit a warning if removed keys keyring is missing and skip associated
+       checks (LP: #218971)
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/packagemanager.cc:
+     - better debug output for ImmediateAdd with depth and why
+     - improve the message shown for failing immediate configuration
+   * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
+   * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
+   * doc/apt.conf.5.xml:
+     - provide a few more details about APT::Immediate-Configure
+     - briefly document the behaviour of the new https options
+   * doc/sources.list.5.xml:
+     - add note about additional apt-transport-methods
+   * doc/apt-mark.8.xml:
+     - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
+   * cmdline/apt-get.cc:
+     - source should display his final pkg pick (Closes: #249383, #550952)
+     - source doesn't need the complete version for match (Closes: #245250)
+     - source ignores versions/releases if not available (Closes: #377424)
+     - only warn if (free) space overflows (Closes: #522238)
+     - add --debian-only as alias for --diff-only
+   * methods/connect.cc:
+     - display also strerror of "wicked" getaddrinfo errors
+     - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
+       in response to Bernhard R. Link, thanks! (Closes: #505020)
+   * buildlib/configure.mak, buildlib/config.{sub,guess}:
+     - remove (outdated) config.{sub,guess} and use the ones provided
+       by the new added build-dependency autotools-dev instead
+   * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
+     - remove the now obsolete manpage buildsystems
+   * doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
+     - convert all remaining translation to the po4a system
+   * debian/control:
+     - drop build-dependency on docbook-utils and xmlto
+     - add build-dependency on autotools-dev
+     - bump policy to 3.8.3 as we have no outdated manpages anymore
+   * debian/NEWS:
+     - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
+   * ftparchive/writer.{cc,h}:
+     - add APT::FTPArchive::LongDescription to be able to disable them
+   * apt-pkg/deb/debsrcrecords.cc:
+     - use "diff" filetype for .debian.tar.* files (Closes: #554898)
+   * methods/rred.cc:
+     - rewrite to be able to handle even big patch files
+     - adopt optional mmap+iovec patch from Morten Hustveit
+       (Closes: #463354) which should speed up a bit. Thanks!
+   * methods/http{,s}.cc
+     - add config setting for User-Agent to the Acquire group,
+       thanks Timothy J. Miller! (Closes: #355782)
+     - add https options which default to http ones (Closes: #557085)
+   * debian/apt.cron.daily:
+     - check cache size even if we do nothing else otherwise, thanks
+       Francesco Poli for patch(s) and patience! (Closes: #459344)
+   * ftparchive/*:
+     - fix a few typos in strings, comments and manpage,
+       thanks Karl Goetz! (Closes: #558757)
+ 
+   [ Carl Chenet ]
+   * cmdline/apt-mark:
+     - print an error if a new state file can't be created
+       (Closes: #521289) and
+     - exit nicely if python-apt is not installed (Closes: #521284)
+ 
+   [ Chris Leick ]
+   * doc/de: German translation of manpages (Closes: #552606)
+   * doc/ various manpages:
+     - correct various errors, typos and oddities (Closes: #552535)
+   * doc/apt-secure.8.xml:
+     - replace literal with emphasis tags in Archive configuration
+   * doc/apt-ftparchive.1.xml:
+     - remove informalexample tag which hides the programlisting
+   * doc/apt-get.8.xml:
+     - change equivalent "for" to "to the" (purge command)
+     - clarify --fix-broken sentence about specifying packages
+ 
+   [ Eugene V. Lyubimkin ]
+   * apt-pkg/contib/strutl.h
+     - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
+   * build infrastructure:
+     - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
+ 
+   [ Julian Andres Klode ]
+   * doc/apt.conf.5.xml:
+     - Deprecate unquoted values, string concatenation and explain what should
+       not be written inside a value (quotes,backslash).
+     - Restrict option names to alphanumerical characters and "/-:._+".
+     - Deprecate #include, we have apt.conf.d nowadays which should be
+       sufficient.
+   * ftparchive/apt-ftparchive.cc:
+     - Call setlocale() so translations are actually used.
+   * debian/apt.conf.autoremove:
+     - Add kfreebsd-image-* to the list (Closes: #558803)
+ 
+  -- 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 ]
@@@ -90,59 -218,6 +240,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 ]
@@@ -242,7 -317,6 +392,7 @@@ apt (0.7.22.1) unstable; urgency=lo
  
  apt (0.7.22) unstable; urgency=low
  
 +
    [ Christian Perrier ]
    * Documentation translations:
      - Fix a typo in apt-get(8) French translation. Closes: #525043
@@@ -251,7 -325,7 +401,7 @@@
        Thanks to Aurélien Couderc.
    * Translations:
      - fr.po
 -    - sk.po. Closes: #525857 
 +    - sk.po. Closes: #525857
      - ru.po. Closes: #526816
      - eu.po. Closes: #528985
      - zh_CN.po. Closes: #531390
@@@ -286,7 -360,6 +436,7 @@@
      which can arise if cache doesn't fit into the mmap (Closes: #535218)
    * display warnings instead of errors if the parts dirs doesn't exist
  
 +
    [ Michael Vogt ]
    * honor the dpkg hold state in new Marker hooks (closes: #64141)
    * debian/apt.cron.daily:
@@@ -374,34 -447,6 +524,34 @@@
  
   -- 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 ]
@@@ -414,7 -459,7 +564,7 @@@
      - sk.po. Closes: #520403
      - it.po. Closes: #522222
      - sk.po. Closes: #520403
 -  
 +
    [ Jamie Strandboge ]
    * apt.cron.daily: catch invalid dates due to DST time changes
      in the stamp files
@@@ -435,7 -480,7 +585,7 @@@
    * Clarify the --help for 'purge' (LP: #243948)
    * 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 
 +      a source package of the same name but from different
        packages (LP: #330103)
  
    [ Colin Watson ]
@@@ -445,125 -490,6 +595,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 ]
@@@ -612,10 -538,10 +762,10 @@@ apt (0.7.20) unstable; urgency=lo
        (Closes: #440049, #509337)
  
    [ Michael Vogt ]
 -  * add option to "apt-get build-dep" to mark the needed 
 -    build-dep packages as automatic installed. 
 +  * add option to "apt-get build-dep" to mark the needed
 +    build-dep packages as automatic installed.
      This is controlled via the value of
 -    APT::Get::Build-Dep-Automatic and is set "false" by default.  
 +    APT::Get::Build-Dep-Automatic and is set "false" by default.
      Thanks to Aaron Haviland, closes: #448743
    * apt-inst/contrib/arfile.cc:
      - support members ending with '/' as well (thanks to Michal Cihr,
@@@ -623,21 -549,15 +773,21 @@@
  
    [ Christian Perrier ]
    * Translations:
 -    - Finnish updated. Closes: #508449 
 +    - Finnish updated. Closes: #508449
      - Galician updated. Closes: #509151
      - Catalan updated. Closes: #509375
      - Vietnamese updated. Closes: #509422
      - Traditional Chinese added. Closes: #510664
 -    - French corrected (remove awful use of first person) 
 +    - French corrected (remove awful use of first person)
  
   -- 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 ]
@@@ -655,8 -575,6 +805,8 @@@
        (Closes: #419521)
  
    [ Michael Vogt ]
 +  * doc/makefile:
 +    - add examples/apt-https-method-example.conf
      - fix SIGHUP handling (closes: #463030)
  
    [ Christian Perrier ]
@@@ -938,103 -856,6 +1088,103 @@@ 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.14ubuntu1) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * enable installation of recommends by default
 +  * debian/apt.conf.ubuntu:
 +    - remove APT::Install-Recommends-Sections (no longer needed)
 +  * merged from debian/sid, remaining changes:
 +    - authentication-reliable branch (to be merged into debian soon)
 +    - mirror:// uri branch (breaks ABI in debian, not merged yet)
 +    - apport failure reporting
 +    - show warning on apt-get source with 'Vcs-' header
 +    - proxy detection from gconf in apt.cron
 +  
  apt (0.7.14) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -1104,7 -925,7 +1254,7 @@@ apt (0.7.12) unstable; urgency=lo
    * apt-pkg/deb/dpkgpm.cc:
      - merged patch from Kees Cook to fix anoying upper-case display
        on amd64 in sbuild
 -  * apt-pkg/algorithms.cc: 
 +  * 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.
@@@ -1143,7 -964,7 +1293,7 @@@
      - French updated.
      - Bulgarian updated. Closes: #448492
      - Galician updated. Closes: #476839
 -  
 +
    [ Daniel Burrows ]
    * apt-pkg/depcache.cc:
      - Patch MarkInstall to follow currently satisfied Recommends even
@@@ -1161,7 -982,7 +1311,7 @@@
      - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.
  
   -- Daniel Burrows <dburrows@debian.org>  Sat, 26 Apr 2008 12:24:35 -0700
 -
 +  
  apt (0.7.11) unstable; urgency=critical
    
    [ Raise urgency to critical since it fixes a critical but for Debian
@@@ -1220,6 -1041,7 +1370,6 @@@ apt (0.7.10) unstable; urgency=lo
      - Simplified Chinese updated. Closes: #458039
      - French updated.
      - Norwegian Bokmål updated. Closes: #457917
 -
    [ Michael Vogt ]
    * debian/rules
      - fix https install location
@@@ -1234,7 -1056,7 +1384,7 @@@
      - make the authentication download code more robust against
        servers/proxies with broken If-Range implementations
    * apt-pkg/packagemanager.{cc,h}:
 -    - propergate the Immediate flag to make hitting the 
 +    - propergate the Immediate flag to make hitting the
        "E: Internal Error, Could not perform immediate configuration (2)"
        harder
    * debian/control:
@@@ -1248,7 -1070,7 +1398,7 @@@
      - support lzma data members
    * ftparchive/multicompress.cc:
      - support lzma output
 -  
 +
    [ Daniel Burrows ]
    * apt-pkg/contrib/configuration.cc:
      - if RootDir is set, then FindFile and FindDir will return paths
@@@ -1257,304 -1079,42 +1407,304 @@@
    [ Christian Perrier ]
    * Fix wording for "After unpacking...". Thanks to Michael Gilbert
      for the patch. Closes: #260825
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Jan 2008 11:31:45 +0100
  
 - -- Michael Vogt <mvo@debian.org>  Mon, 07 Jan 2008 21:40:47 +0100
 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low
  
 -apt (0.7.9) unstable; urgency=low
 +  * apt-pkg/acquire-item.cc:
 +    - fix signaure removal on transient network failures LP: #220627
 +      (thanks to Scott James Remnant)
  
 -  [ 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
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 16:32:49 +0200
  
 -  [ Program translations ]
 -    - Korean updated. Closes: #448430
 -    - Galician updated. Closes: #448497
 -    - Swedish updated.
 +apt (0.7.9ubuntu16) hardy; urgency=low
  
 -  [ 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.
 +  * cmdline/apt-key:
 +    - only check against master-keys in net-update to not break
 +      custom CDs (thanks to Colin Watson)
  
 - -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 14:17:14 +0200
  
 -apt (0.7.8) unstable; urgency=low
 +apt (0.7.9ubuntu15) hardy; urgency=low
  
 -  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 -    APT::Acquire::Translation "none" support, closes: #437523.
 -  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 -    for the Homepage field (ABI break), closes: #447970.
 -  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 -    space after cd label, closes: #448187.
 +  * 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)
  
 - -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
 + -- 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
 +
 +  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 +    APT::Acquire::Translation "none" support, closes: #437523.
 +  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 +    for the Homepage field (ABI break), closes: #447970.
 +  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 +    space after cd label, closes: #448187.
 +
 + -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
  
  apt (0.7.7) unstable; urgency=low
  
@@@ -1647,192 -1207,12 +1797,192 @@@
   
   -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
  
 -apt (0.7.6) unstable; urgency=low
 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
  
 -  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
 -    directory downloading on non-linux architectures (closes: #435597)
 +  [ 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)
  
 - -- Otavio Salvador <otavio@debian.org>  Wed, 01 Aug 2007 19:49:51 -0300
 +  [ 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
  
@@@ -1861,14 -1241,6 +2011,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 ]
@@@ -1928,90 -1300,6 +2078,90 @@@ apt (0.7.3) unstable; urgency=lo
            which disappeared from the BZR repositories
  
   -- 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
  
@@@ -2068,136 -1356,45 +2218,136 @@@ apt (0.7.1) experimental; urgency=lo
      - use clog for all debugging
      - only increase the score of installed applications if they 
        are not obsolete 
 -    - fix resolver bug on removal triggered by weak-dependencies 
 -      with or-groups
 -  * methods/http.cc:
 -    - send apt version in User-Agent
 -  * apt-pkg/deb/debrecords.cc:
 -    - fix SHA1Hash() return value
 -  * apt-pkg/cdrom.cc:
 -    - only unmount if APT::CDROM::NoMount is false
 -  * methods/cdrom.cc:  
 -    - only umount if it was mounted by the method before
 -  * po/gl.po:
 -    - fix error translation that causes trouble to lsb_release
 -  * apt-pkg/acquire-item.cc:
 -    - if decompression of a index fails, delete the index 
 -  * apt-pkg/acquire.{cc,h}:
 -    - deal better with duplicated sources.list entries (avoid
 -      double queuing of  URLs) - this fixes hangs in bzip/gzip
 -  * merged from Christian Perrier:
 -    * mr.po: New Marathi translation  Closes: #416806
 -    * zh_CN.po: Updated by Eric Pareja  Closes: #416822
 -    * tl.po: Updated by Eric Pareja   Closes: #416638
 -    * gl.po: Updated by Jacobo Tarrio
 -             Closes: #412828
 -    * da.po: Updated by Claus Hindsgaul
 -             Closes: #409483
 -    * fr.po: Remove a non-breakable space for usability
 -             issues. Closes: #408877
 -    * ru.po: Updated Russian translation. Closes: #405476
 -    * *.po: Unfuzzy after upstream typo corrections
 -    * vi.po: Updated to 515t. Closes: #426976
 -    * eu.po: Updated to 515t. Closes: #423766
 -    * pt.po: 515t. Closes: #423111
 -    * fr.po: Updated by Christian Perrier
 -    * Update all PO and the POT. Gives 513t2f for formerly
 -      complete translations
 -  * apt-pkg/policy.cc:
 -    - allow multiple packages (thanks to David Foerster)
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +  * methods/cdrom.cc:  
 +    - only umount if it was mounted by the method before
 +  * po/gl.po:
 +    - fix error in translation that causes trouble to lsb_release 
 +      (LP#79165)
 +  * apt-pkg/acquire-item.cc:
 +    - if decompression of a index fails, delete the index 
 +  * apt-pkg/acquire.{cc,h}:
 +    - deal better with duplicated sources.list entries (avoid
 +      double queuing of  URLs) - this fixes hangs in bzip/gzip
 +      (LP#102511)
 +  * Fix broken use of awk in apt-key that caused removal of the wrong keys
 +    from the keyring. Closes: #412572
 +  * merged from Christian Perrier:
 +    * mr.po: New Marathi translation  Closes: #416806
 +    * zh_CN.po: Updated by Eric Pareja  Closes: #416822
 +    * tl.po: Updated by Eric Pareja   Closes: #416638
 +    * gl.po: Updated by Jacobo Tarrio
 +             Closes: #412828
 +    * da.po: Updated by Claus Hindsgaul
 +             Closes: #409483
 +    * fr.po: Remove a non-breakable space for usability
 +             issues. Closes: #408877
 +    * ru.po: Updated Russian translation. Closes: #405476
 +    * *.po: Unfuzzy after upstream typo corrections
 +    * vi.po: Updated to 515t. Closes: #426976
 +    * eu.po: Updated to 515t. Closes: #423766
 +    * pt.po: 515t. Closes: #423111
 +    * fr.po: Updated by Christian Perrier
 +    * Update all PO and the POT. Gives 513t2f for formerly
 +      complete translations
 +  * apt-pkg/policy.cc:
 +    - allow multiple packages (thanks to David Foerster)
 +
 + -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 +
 +apt (0.6.46.4ubuntu10) feisty; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - added "APT::Never-MarkAuto-Section" and consider dependencies 
 +      of packages in this section manual (LP#59893)
 +    - ensure proper permissions in the extended_state file (LP#67037)
 +  * debian/apt.conf.ubuntu:
 +    - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
 +  * cmdline/apt-get.cc:
 +    - "apt-get install foo" on a already installed package foo will
 +      clean the automatic installed flag (LP#72007)
 +    - do not show packages already marked for removal as auto-installed
 +      (LP#64493)
 +    - applied patch to (optionally) hide the auto-remove information
 +      (thanks to Frode M. Døving) (LP#69148)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100
 +
 +apt (0.6.46.4ubuntu9) feisty; urgency=low
 +
 +  * debian/control:
 +    - set XS-Vcs-Bzr header
 +    - Set Ubuntu maintainer address
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +    - only umount if it was mounted by the method before
 +  * cmdline/apt-get.cc:
 +    - fix version output in autoremove list (LP#68941)
 +  * apt-pkg/packagemanager.cc:
 +    - do not spin 100% cpu in FixMissing() (LP#84476)
 +  * apt-pkg/indexfile.cc:
 +    - fix problem overwriting APT::Acquire::Translation
 +  * doc/examples/configure-index:
 +    - document APT::Acquire::Translation
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 15:24:39 +0100
 +
 +apt (0.6.46.4ubuntu8) feisty; urgency=low
 +
 +  * fix segfault in the pkgRecords destructor
 +  * Bump ABI version
 +  * debian/control:
 +    - make the libcurl3-gnutls-dev versionized (LP#86614)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:26:33 +0100
 +
 +apt (0.6.46.4ubuntu7) feisty; urgency=low
 +
 +  * Merged the apt--mirror branch. This means that a new 'mirror' 
 +    method is available that will allow dynamic mirror updates.
 +    The sources.list entry looks something like this:
 +    "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
 +
 +    It also supports error reporting to a configurable url for mirror
 +    problems/failures.
 +  * Bump ABI version
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:38:06 +0100
 +
 +apt (0.6.46.4ubuntu6) feisty; urgency=low
 +
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/algorithms.cc:
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +    - fix segfault (lp: #76530)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
 +
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
 +
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
 +
 +apt (0.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
  
 - -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
  
  apt (0.7.0) experimental; urgency=low
  
@@@ -2226,29 -1423,6 +2376,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
  
 +apt (0.6.46.4ubuntu3) feisty; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - use clog for all debugging
 +  * apt-pkg/depcache.cc:
 +    - never mark Required package for autoremoval (lp: #75882)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
 +
 +apt (0.6.46.4ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +    (thanks to Ian Jackson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 23:07:24 +0100
 +
 +apt (0.6.46.4ubuntu1) feisty; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
 +
  apt (0.6.46.4-0.1) unstable; urgency=emergency
    
    * NMU
@@@ -2295,26 -1469,6 +2445,26 @@@ apt (0.6.46.3-0.1) unstable; urgency=hi
    
   -- Andreas Barth <aba@not.so.argh.org>  Tue,  5 Dec 2006 10:34:56 +0000
  
 +apt (0.6.46.3ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Thu,  7 Dec 2006 15:46:52 +0000
 +
 +apt (0.6.46.3ubuntu1) feisty; urgency=low
 +
 +  * doc/apt-get.8.xml:
 +    - documented autoremove, thanks to Vladimír Lapá\e%GÄ\8d\e%@ek 
 +      (lp: #62919)
 +  * fix broken i18n in the dpkg progress reporting, thanks to 
 +    Frans Pop and Steinar Gunderson. (closes: #389261)
 +  * po/en_GB.po:
 +    - typo (lp: #61270)
 +  * add apt-secure.8 to "See also" section
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 23 Nov 2006 07:24:12 +0100
 +
  apt (0.6.46.3) unstable; urgency=low
  
    * apt-pkg/deb/dpkgpm.cc:
@@@ -2379,46 -1533,10 +2529,46 @@@ apt (0.6.46) unstable; urgency=lo
    * 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)
 +    - 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.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:
@@@ -2443,113 -1561,8 +2593,113 @@@
        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 <mvo@debian.org>  Thu, 21 Sep 2006 10:25:03 +0200
 + -- 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
  
@@@ -2587,57 -1600,42 +2737,57 @@@
      * dz.po: New Dzongkha translation: 512t
      * ro.po: Updated to 512t
      * eu.po: Updated
 -    * eu.po: Updated
 -  * fix apt-get dist-upgrade
 -  * fix warning if no /var/lib/apt/extended_states is present
 -  * don't download Translations for deb-src sources.list lines
 -  * apt-pkg/tagfile.cc:
 -    - support not-mmapable files again
  
   -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
  
 -apt (0.6.44.2exp1) experimental; urgency=low
 +apt (0.6.44.2ubuntu4) edgy; urgency=low
  
 -  * added support for i18n of the package descriptions
 -  * added support for aptitude like auto-install tracking (a HUGE
 -    HUGE thanks to Daniel Burrows who made this possible) 
 -  * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
 -  * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
 +  * Make apt-get dselect-upgrade happy again
  
 - -- Michael Vogt <mvo@debian.org>  Mon,  3 Jul 2006 21:50:31 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Jul 2006 11:03:02 +0200
  
 -apt (0.6.44.2) unstable; urgency=low
 +apt (0.6.44.2ubuntu3) edgy; urgency=low
  
 -  * apt-pkg/depcache.cc:
 -    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 -  * apt-pkg/acquire-item.cc:
 -    - fix missing chmod() in the new aquire code 
 -      (thanks to Bastian Blank, Closes: #367425)
 -  * merged from 
 -    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 -    * sk.po: Completed to 512t
 -    * eu.po: Completed to 512t
 -    * fr.po: Completed to 512t
 -    * sv.po: Completed to 512t
 -    * Update all PO and the POT. Gives 506t6f for formerly
 -      complete translations
 +  * 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
  
 - -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200
 +apt (0.6.44.2) unstable; urgency=low
 +  
 +   * apt-pkg/depcache.cc:
 +     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 +   * apt-pkg/acquire-item.cc:
 +     - fix missing chmod() in the new aquire code
 +       (thanks to Bastian Blank, Closes: #367425)
 +   * merged from
 +     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 +     * sk.po: Completed to 512t
 +     * eu.po: Completed to 512t
 +     * fr.po: Completed to 512t
 +     * sv.po: Completed to 512t
 +     * Update all PO and the POT. Gives 506t6f for formerly
 +       complete translations
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
  
  apt (0.6.44.1-0.1) unstable; urgency=low
  
@@@ -2699,26 -1697,6 +2849,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:
@@@ -2728,46 -1706,16 +2878,46 @@@
      * pl.po: Completed to 512t. Closes: #349514
      * sk.po: Completed to 512t. Closes: #349474
      * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
      * sv.po: Completed to 512 strings Closes: #349210
      * ru.po: Completed to 512 strings Closes: #349154
      * da.po: Completed to 512 strings Closes: #349084
      * fr.po: Completed to 512 strings
 +    * LINGUAS: Add Welsh
 +    * *.po: Updated from sources (512 strings)
      * vi.po: Completed to 511 strings  Closes: #348968
 -    * zh_CN.po: Completed to 512t. Closes: #353936
 -    * it.po: Completed to 512t. Closes: #352803
 -    * pt_BR.po: Completed to 512t. Closes: #352419
 +  * apt-pkg/deb/deblistparser.cc:
 +    - don't explode on a DepCompareOp in a Provides line, but warn about
 +      it and ignore it otherwise (thanks to James Troup for reporting it)
 +  * cmdline/apt-get.cc:
 +    - don't lock the lists directory in DoInstall, breaks --print-uri 
 +      (thanks to James Troup for reporting it)
 +  * debian/apt.dirs: create /etc/apt/sources.list.d 
 +  * make apt-cache madison work without deb-src entries (#352583)
 +  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
 +    successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
 +
 + --  Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 +
 +apt (0.6.43.2ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
 +  * ca.po: Completed to 512t. Closes: #351592
 +    * eu.po: Completed to 512t. Closes: #350483
 +    * ja.po: Completed to 512t. Closes: #349806
 +    * pl.po: Completed to 512t. Closes: #349514
 +    * sk.po: Completed to 512t. Closes: #349474
 +    * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
 +    * sv.po: Completed to 512 strings Closes: #349210
 +    * ru.po: Completed to 512 strings Closes: #349154
 +    * da.po: Completed to 512 strings Closes: #349084
 +    * fr.po: Completed to 512 strings
      * LINGUAS: Add Welsh
      * *.po: Updated from sources (512 strings)
 +    * vi.po: Completed to 511 strings  Closes: #348968
    * apt-pkg/deb/deblistparser.cc:
      - don't explode on a DepCompareOp in a Provides line, but warn about
        it and ignore it otherwise (thanks to James Troup for reporting it)
@@@ -2778,10 -1726,8 +2928,10 @@@
    * make apt-cache madison work without deb-src entries (#352583)
    * cmdline/apt-get.cc: only run the list-cleaner if a update was 
      successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
  
 - -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
  
  apt (0.6.43.2) unstable; urgency=low
  
@@@ -2806,26 -1752,8 +2956,26 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
 -apt (0.6.43.1) unstable; urgency=low
 +apt (0.6.43.1ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
 +    - en_GB.po, de.po: fix spaces errors in "Ign " translations
 +      Closes: #347258
 +    - makefile: make update-po a pre-requisite of clean target so
 +              that POT and PO files are always up-to-date
 +    - sv.po: Completed to 511t. Closes: #346450
 +    - sk.po: Completed to 511t. Closes: #346369
 +    - fr.po: Completed to 511t
 +    - *.po: Updated from sources (511 strings)
 +  * add patch to fix http download corruption problem (thanks to
 +    Petr Vandrovec, closes: #280844, #290694)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
  
 +apt (0.6.43.1) unstable; urgency=low
 +  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
      * fr.po: Completed to 510 strings
      * it.po: Completed to 510t
@@@ -2847,19 -1775,6 +2997,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:  
@@@ -2880,22 -1795,6 +3030,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:
@@@ -2943,13 -1842,13 +3093,13 @@@ apt (0.6.42) unstable; urgency=lo
      - unmount the cdrom when apt failed to locate any package files
    * allow cdrom failures and fallback to other sources in that case
      (closes: #44135)
 -  * better error text when dpkg-source fails 
 +  * better error text when dpkg-source fails
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
      - patch-99: Added Galician translation
      - patch-100: Completed Danish translation (Closes: #325686)
      - patch-104: French translation completed
      - patch-109: Italian translation completed
 -    - patch-112: Swedish translation update 
 +    - patch-112: Swedish translation update
      - patch-115: Basque translation completed (Closes: #333299)
    * applied french man-page update (thanks to Philippe Batailler)
      (closes: #316638, #327456)
@@@ -2963,9 -1862,9 +3113,9 @@@
    * apt-pkg/contrib/md5.cc:
      - fix a alignment problem on sparc64 that gives random bus errors
        (thanks to Fabbione for providing a test-case)
 -  * init the default ScreenWidth to 79 columns by default 
 +  * init the default ScreenWidth to 79 columns by default
      (Closes: #324921)
 -  * cmdline/apt-cdrom.cc: 
 +  * cmdline/apt-cdrom.cc:
      - fix some missing gettext() calls (closes: #334539)
    * doc/apt-cache.8.xml: fix typo (closes: #334714)
  
@@@ -2976,8 -1875,8 +3126,8 @@@ apt (0.6.41) unstable; urgency=lo
    * improved the support for "error" and "conffile" reporting from
      dpkg, added the format to README.progress-reporting
    * added README.progress-reporting to the apt-doc package
 -  * improved the network timeout handling, if a index file from a 
 -    sources.list times out or EAI_AGAIN is returned from getaddrinfo, 
 +  * improved the network timeout handling, if a index file from a
 +    sources.list times out or EAI_AGAIN is returned from getaddrinfo,
      don't try to get the other files from that entry
    * Support architecture-specific extra overrides
      (closes: #225947). Thanks to  Anthony Towns for idea and
@@@ -2985,10 -1884,10 +3135,10 @@@
    * Javier Fernandez-Sanguino Pen~a:
      - Added a first version of an apt-secure.8 manpage, and modified
        apt-key and apt.end accordingly. Also added the 'update'
 -      argument to apt-key which was previously not documented 
 +      argument to apt-key which was previously not documented
        (Closes: #322120)
    * Andreas Pakulat:
 -    - added example apt-ftparchive.conf file to doc/examples 
 +    - added example apt-ftparchive.conf file to doc/examples
        (closes: #322483)
    * Fix a incorrect example in the man-page (closes: #282918)
    * Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@@ -2997,84 -1896,10 +3147,84 @@@
    * Change pkgPolicy::Pin from private to protected to let subclasses
      access it too (closes: #321799)
    * add default constructor for PrvIterator (closes: #322267)
 -  * Reread status configuration on debSystem::Initialize() 
 +  * Reread status configuration on debSystem::Initialize()
      (needed for apt-proxy, thanks to Otavio for this patch)
 -  
 +
   -- Michael Vogt <mvo@debian.org>  Mon,  5 Sep 2005 22:59:03 +0200
 +  
 +apt (0.6.40.1ubuntu8) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
 +    - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
 +  * po/de.po, po/fr.po: 
 +    - updated the translations
 +  * po/makefile:
 +    - create a single pot file in each domain dir to make rosetta happy
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 +
 +apt (0.6.40.1ubuntu7) breezy; urgency=low
 +
 +  * updated the pot/po files , no code changes
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Sep 2005 18:38:16 +0200
 +
 +apt (0.6.40.1ubuntu6) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
 +    - make it possible for apt to handle a failed MediaChange event and
 +      fall back to other sources (ubuntu #13713)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2005 22:09:50 +0200
 +
 +apt (0.6.40.1ubuntu5) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
 +    This adds media-change reporting to the apt status-fd (ubuntu #15213)
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
 +    apt-pkg/cdrom.cc:
 +    - unmount the cdrom when apt failed to locate any package files
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 15:44:26 +0200
 +
 +apt (0.6.40.1ubuntu4) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - fix a embarrassing typo
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 10:10:37 +0200
 +
 +apt (0.6.40.1ubuntu3) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use the ctime as well when figuring what packages need to
 +      be removed. This fixes the problem that packages copied with    
 +      "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Sep 2005 18:30:46 +0200
 +
 +apt (0.6.40.1ubuntu2) breezy; urgency=low
 +
 +  * improved the support for "error" and "conffile" reporting from
 +    dpkg, added the format to README.progress-reporting
 +  * added README.progress-reporting to the apt-doc package
 +  * Do md5sum checking for file and cdrom method (closes: #319142)
 +  * Change pkgPolicy::Pin from private to protected to let subclasses
 +    access it too (closes: #321799)
 +  * methods/connect.cc:
 +    - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
 +  * apt-pkg/acquire-item.cc:
 +    - fail early if a FailReason is TmpResolveFailure (avoids hangs during
 +      the install when no network is available)
 +  * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 19:44:55 +0200
 +
 +apt (0.6.40.1ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 14:20:56 +0200
  
  apt (0.6.40.1) unstable; urgency=low
  
@@@ -3085,12 -1910,6 +3235,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
@@@ -3106,39 -1925,6 +3256,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
@@@ -3149,14 -1935,7 +3299,14 @@@
    * Update priority of apt-utils to important, to match the override file
    * Install only one keyring on each branch (Closes: #316119)
  
 - -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -0700
 + -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:35:21 -0700
 +
 +apt (0.6.38ubuntu1) breezy; urgency=low
 +
 +  * First release from Ubuntu branch
 +  * Merge with --main--0, switch back to Ubuntu keyring
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 25 Jun 2005 16:52:41 -0700
  
  apt (0.6.38) unstable; urgency=low
  

diff --combined debian/control
index 9ffa732e2c424e791bfb6679019af49e7c327376,357fb3f5f21675d3f0d8023f65f15a16086d5a30..9d15d21332d1b6433167b08ea4b2382a15a2f5c0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,23 -1,20 +1,23 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Core 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>,
   Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
- Standards-Version: 3.8.2.0
- Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), intltool
+ Standards-Version: 3.8.3
 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
++Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, intltool
++Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
  
  Package: apt
  Architecture: any
 -Depends: ${shlibs:Depends}, debian-archive-keyring
 +Depends: ${shlibs:Depends}
 +Priority: important
  Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
  Provides: ${libapt-pkg:provides}
 +Recommends: ubuntu-keyring
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
- Section: admin
  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 
@@@ -56,10 -53,8 +56,8 @@@ Description: Documentation for APT deve
  Package: apt-utils
  Architecture: any
  Depends: ${shlibs:Depends}
- Priority: important
  Provides: ${libapt-inst:provides}
  Replaces: apt (<< 0.5.9)
- Section: admin
  Description: APT utility programs
   This package contains some APT utility programs such as apt-ftparchive,
   apt-sortpkgs and apt-extracttemplates.
@@@ -72,7 -67,6 +70,6 @@@ Package: apt-transport-http
  Architecture: any
  Depends: ${shlibs:Depends}
  Priority: optional
- Section: admin
  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.

diff --combined debian/rules
index 2a18f4f47c83cc7c39727fd570bae5c21f3000cd,d01b57cd637aa84c1530b737b09b8196f6b918de..6fc2ec9f0dd33356b78db97dbefc8d8ff06ee803
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -75,25 -75,24 +75,24 @@@ APT_UTILS=ftparchive sortpkgs extractte
  #export DH_VERBOSE=1
  
  # Find the libapt-pkg major version for use in other control files
- export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
- export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)
+ include buildlib/libversion.mak
  
  # Determine which package we should provide in the control files
- LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
- LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
+ LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR)
+ LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR)
  
  debian/shlibs.local: apt-pkg/makefile
        # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
        # one for the rest of the packages. This ensures that each package gets
        # the right overrides.. 
        rm -rf $@ $@.apt $@.apt-utils
-       echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
+       echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt
  
-       echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
-       echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+       echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+       echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
  
-       echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
-       echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+       echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+       echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
  
  build: build/build-stamp      
  build-doc: build/build-doc-stamp      
@@@ -131,7 -130,7 +130,7 @@@ clean
        rm -rf build
  
        # Add here commands to clean up after the build process.
 -      dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils
 +      dh_clean debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils
  
  binary-indep: apt-doc libapt-pkg-doc
  # Build architecture-independent files here.
@@@ -214,10 -213,8 +213,10 @@@ apt: build build-doc debian/shlibs.loca
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
        cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
  
 -      cp share/debian-archive.gpg debian/$@/usr/share/$@
 +      cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
 +      sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 +      cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
  #     head -n 500 ChangeLog > debian/ChangeLog
  
        # copy lintian override
@@@ -228,10 -225,6 +227,10 @@@
        rm -f build/po/*.pot
        rm -f po/*.pot
  
 +      # move the mirror failure script in place
 +      mv debian/$@/usr/bin/apt-report-mirror-failure \
 +         debian/$@/usr/lib/apt/apt-report-mirror-failure \
 +
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
        dh_installcron -p$@

diff --combined doc/examples/configure-index
index adef8035905dce47a6cb43e3b22230828cb12b64,1e9946e1b65c18c2f0fef1e3a5c580e9439c47a6..89ab3ed8a1d534d7a2bd796c3b6aa4eceb4ca759
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -108,9 -108,6 +108,9 @@@ AP
    Install-Recommends "true";
    Install-Suggests "false";
  
 +  // install recommends automatically for packages in this section
 +  Install-Recommends-Section { "metapackages"; "universe/metapackages"; };
 +  
    // consider dependencies of packages in this section manual
    Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };
  
@@@ -194,19 -191,37 +194,37 @@@ Acquir
      Max-Age "86400";     // 1 Day age on index files
      No-Store "false";    // Prevent the cache from storing archives    
      Dl-Limit "7";        // 7Kb/sec maximum download rate
+     User-Agent "Debian APT-HTTP/1.3";
    };
  
-   // HTTPS method configuration:
-   // - uses the http proxy config 
-   // - uses the http cache-control values
-   // - uses the http Dl-Limit values
-   https 
+ 
+ 
+   // HTTPS method configuration: uses the http
+   // - proxy config
+   // - cache-control values
+   // - Dl-Limit, Timout, ... values
+   // if not set explicit for https
+   //
+   // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz
+   // for more examples
+   https
    {
        Verify-Peer "false";
        SslCert "/etc/apt/some.pem";
-         CaPath  "/etc/ssl/certs";
-         Verify-Host" "true";
-         AllowRedirect  "true";
+       CaPath  "/etc/ssl/certs";
+       Verify-Host" "true";
+       AllowRedirect  "true";
+ 
+       Timeout "120";
+       AllowRedirect  "true";
+ 
+       // Cache Control. Note these do not work with Squid 2.0.2
+       No-Cache "false";
+       Max-Age "86400";     // 1 Day age on index files
+       No-Store "false";    // Prevent the cache from storing archives
+       Dl-Limit "7";        // 7Kb/sec maximum download rate
+ 
+       User-Agent "Debian APT-CURL/1.0";
    };
  
    ftp
@@@ -250,28 -265,14 +268,25 @@@
     Options {"--ignore-time-conflict";}        // not very useful on a normal system
    };
  
 +  mirror
 +  {
 +   RefreshInterval "360"; // refresh interval in minutes
 +   MaxAge "90";           // max age for a mirror file in days before 
 +                          // it gets deleted
 +   // mirror failure reporting script
 +   ProblemReporting "/usr/lib/apt/apt-report-mirror-failure"; 
 +   // mirror failure reporting url
 +   ReportFailures "http://example.com/mirror-failure"; 
 +   };
 +
    CompressionTypes
    {
      bz2 "bzip2";
      lzma "lzma";
      gz "gzip";
-   };
-   
-   Order { "gz"; "lzma"; "bz2"; };
  
-   // translations can be set here to "none", "environment" or "$locale"
-   Translation "none";
+     Order { "gz"; "lzma"; "bz2"; };
+   };
  };
  
  // Directory layout
@@@ -285,7 -286,6 +300,7 @@@ Dir "/
       userstatus "status.user";
       status "/var/lib/dpkg/status";
       cdroms "cdroms.list";
 +     mirrors "mirrors/";
    };
    
    // Location of the cache dir
@@@ -325,6 -325,7 +340,7 @@@
    // Location of the logfile
    Log "var/log/apt" {
        Terminal "term.log";
+       History "history.log";
    };
  };
  
@@@ -397,10 -398,10 +413,10 @@@ Debu
    Acquire::Http "false";   // Show http command traffic
    Acquire::Https "false";   // Show https debug
    Acquire::gpgv "false";   // Show the gpgv traffic
 +  Acquire::Mirror "false"; // Show debugging of the mirror method
    aptcdrom "false";        // Show found package files
    IdentCdrom "false";
    acquire::netrc "false";  // netrc parser
 -  
  }
  
  /* Whatever you do, do not use this configuration file!! Take out ONLY

diff --combined methods/connect.cc
index c5d57a99fc881084cc9acfe407cd11dd0233491f,adb16a19973c9341dfc9b38f0a311f913cac63a2..ea3794e16548054e5f6b1c989b46091a2354c64b
--- 1/methods/connect.cc
--- 2/methods/connect.cc
+++ b/methods/connect.cc
@@@ -18,7 -18,6 +18,7 @@@
  #include <stdio.h>
  #include <errno.h>
  #include <unistd.h>
 +#include <sstream>
  
  #include<set>
  #include<string>
@@@ -71,17 -70,19 +71,17 @@@ static bool DoConnect(struct addrinfo *
     Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);
  
     // if that addr did timeout before, we do not try it again
 -   if(bad_addr.find(string(Name)) != bad_addr.end()) 
 +   if(bad_addr.find(string(Name)) != bad_addr.end())
        return false;
  
     /* If this is an IP rotation store the IP we are using.. If something goes
        wrong this will get tacked onto the end of the error message */
     if (LastHostAddr->ai_next != 0)
     {
 -      char Name2[NI_MAXHOST + NI_MAXSERV + 10];
 -      snprintf(Name2,sizeof(Name2),_("[IP: %s %s]"),Name,Service);
 -      Owner->SetFailExtraMsg(string(Name2));
 -   }   
 -   else
 -      Owner->SetFailExtraMsg("");
 +      std::stringstream ss;
 +      ioprintf(ss, _("[IP: %s %s]"),Name,Service);
 +      Owner->SetIP(ss.str());
 +   }
        
     // Get a socket
     if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
@@@ -99,7 -100,7 +99,7 @@@
        nonblocking */
     if (WaitFd(Fd,true,TimeOut) == false) {
        bad_addr.insert(bad_addr.begin(), string(Name));
 -      Owner->SetFailExtraMsg("\nFailReason: Timeout");
 +      Owner->SetFailReason("Timeout");
        return _error->Error(_("Could not connect to %s:%s (%s), "
                           "connection timed out"),Host.c_str(),Service,Name);
     }
@@@ -114,7 -115,7 +114,7 @@@
     {
        errno = Err;
        if(errno == ECONNREFUSED)
 -         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
 +         Owner->SetFailReason("ConnectionRefused");
        return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
     }
@@@ -157,6 -158,7 +157,7 @@@ bool Connect(string Host,int Port,cons
        struct addrinfo Hints;
        memset(&Hints,0,sizeof(Hints));
        Hints.ai_socktype = SOCK_STREAM;
+       Hints.ai_flags = AI_ADDRCONFIG;
        Hints.ai_protocol = 0;
        
        // if we couldn't resolve the host before, we don't try now
@@@ -179,18 -181,18 +180,18 @@@
                  continue;
               }
               bad_addr.insert(bad_addr.begin(), Host);
 -             Owner->SetFailExtraMsg("\nFailReason: ResolveFailure");
 +             Owner->SetFailReason("ResolveFailure");
               return _error->Error(_("Could not resolve '%s'"),Host.c_str());
            }
            
            if (Res == EAI_AGAIN)
            {
 -             Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
 +             Owner->SetFailReason("TmpResolveFailure");
               return _error->Error(_("Temporary failure resolving '%s'"),
                                    Host.c_str());
            }
-           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"),
-                                Host.c_str(),ServStr,Res);
+           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
+                                Host.c_str(),ServStr,Res,gai_strerror(Res));
         }
         break;
        }
@@@ -236,6 -238,6 +237,6 @@@
  
     if (_error->PendingError() == true)
        return false;   
-    return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr);
+    return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);
  }
                                                                        /*}}}*/

diff --combined methods/http.cc
index e2057f436b25b032f1e14d1de2dec3197489712c,2dae87a02be878cb3da87c0c18336a8633b2c743..47e7c5f50c54988e2903994e9a4776e88cbc7b0a
--- 1/methods/http.cc
--- 2/methods/http.cc
+++ b/methods/http.cc
@@@ -731,7 -731,8 +731,8 @@@ void HttpMethod::SendReq(FetchItem *Itm
        Req += string("Authorization: Basic ") + 
            Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
     }
-    Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n";
+    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
 -              "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
++              "Ubuntu APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
     
     if (Debug == true)
        cerr << Req << endl;
@@@ -955,9 -956,6 +956,9 @@@ int HttpMethod::DealWithHeaders(FetchRe
        failure */
     if (Srv->Result < 200 || Srv->Result >= 300)
     {
 +      char err[255];
 +      snprintf(err,sizeof(err)-1,"HttpError%i",Srv->Result);
 +      SetFailReason(err);
        _error->Error("%u %s",Srv->Result,Srv->Code);
        if (Srv->HaveContent == true)
         return 4;
@@@ -1034,7 -1032,7 +1035,7 @@@ void HttpMethod::SigTerm(int
     depth. */
  bool HttpMethod::Fetch(FetchItem *)
  {
 -   if (Server == 0)
 +   if (Server == 0) 
        return true;
  
     // Queue the requests
@@@ -1324,4 -1322,15 +1325,4 @@@ int HttpMethod::Loop(
  }
                                                                        /*}}}*/
  
 -int main()
 -{
 -   setlocale(LC_ALL, "");
 -   // ignore SIGPIPE, this can happen on write() if the socket
 -   // closes the connection (this is dealt with via ServerDie())
 -   signal(SIGPIPE, SIG_IGN);
 -
 -   HttpMethod Mth;
 -   return Mth.Loop();
 -}
 -
  

diff --combined methods/makefile
index f4d417cee722c765cb56d7e73d02ad64ce3a6559,7bcae6b9b59ba2f967fdc545cf9f2a263a4c4537..eabe85cfd468e7b2da3533169bf435fc5eb76072
--- 1/methods/makefile
--- 2/methods/makefile
+++ b/methods/makefile
@@@ -6,9 -6,8 +6,8 @@@ SUBDIR=method
  include ../buildlib/defaults.mak
  BIN := $(BIN)/methods
  
- # FIXME..
- LIB_APT_PKG_MAJOR = 4.8
- APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+ include ../buildlib/libversion.mak
+ APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
  
  # The file method
  PROGRAM=file
@@@ -49,7 -48,7 +48,7 @@@ include $(PROGRAM_H
  PROGRAM=http
  SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
  LIB_MAKES = apt-pkg/makefile
 -SOURCE = http.cc rfc2553emu.cc connect.cc
 +SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
  include $(PROGRAM_H)
  
  # The https method
@@@ -80,17 -79,9 +79,17 @@@ LIB_MAKES = apt-pkg/makefil
  SOURCE = rsh.cc
  include $(PROGRAM_H)
  
 +# The mirror method
 +PROGRAM=mirror
 +SLIBS = -lapt-pkg $(SOCKETLIBS)
 +LIB_MAKES = apt-pkg/makefile
 +SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
 +include $(PROGRAM_H)
 +
  # SSH and bzip2 method symlink
  binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma
  veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma
 +
  $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh