merged sftp://bzr.debian.org/bzr/apt/apt/debian-sid

diff --combined apt-pkg/deb/dpkgpm.cc
index 7e937a85b6236d423d27e80f288a86a37eb0b239,ae9143e0d842e26c930b34bc3a4c45d3dd4a8fed..4f0957b8ead3a8a5324d207f5370f0b39796babf
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -29,6 -29,7 +29,6 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 -#include <string.h>
  #include <stdio.h>
  #include <string.h>
  #include <algorithm>
@@@ -186,7 -187,7 +186,7 @@@ pkgDPkgPM::~pkgDPkgPM(
  bool pkgDPkgPM::Install(PkgIterator Pkg,string File)
  {
     if (File.empty() == true || Pkg.end() == true)
-       return _error->Error("Internal Error, No file name for %s",Pkg.Name());
+       return _error->Error("Internal Error, No file name for %s",Pkg.FullName().c_str());
  
     // If the filename string begins with DPkg::Chroot-Directory, return the
     // substr that is within the chroot so dpkg can access it.
@@@ -1460,7 -1461,7 +1460,7 @@@ void pkgDPkgPM::WriteApportReport(cons
     string::size_type pos;
     FILE *report;
  
 -   if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
 +   if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
     {
        std::clog << "configured to not write apport reports" << std::endl;
        return;
@@@ -1487,49 -1488,18 +1487,49 @@@
     }
  
     // do not report out-of-memory failures 
 -   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
 +   if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
 +      strstr(errormsg, "failed to allocate memory") != NULL) {
        std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
        return;
     }
  
 -   // do not report dpkg I/O errors
 -   // XXX - this message is localized, but this only matches the English version.  This is better than nothing.
 -   if(strstr(errormsg, "short read in buffer_copy (")) {
 -      std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +   // do not report bugs regarding inaccessible local files
 +   if(strstr(errormsg, strerror(ENOENT)) != NULL ||
 +      strstr(errormsg, "cannot access archive") != NULL) {
 +      std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
 +      return;
 +   }
 +
 +   // do not report errors encountered when decompressing packages
 +   if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
 +      std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
        return;
     }
  
 +   // do not report dpkg I/O errors, this is a format string, so we compare
 +   // the prefix and the suffix of the error with the dpkg error message
 +   vector<string> io_errors;
 +   io_errors.push_back(string("failed to read on buffer copy for %s"));
 +   io_errors.push_back(string("failed in write on buffer copy for %s"));
 +   io_errors.push_back(string("short read on buffer copy for %s"));
 +
 +   for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++)
 +   {
 +      vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%');
 +      if (list.size() > 1) {
 +         // we need to split %s, VectorizeString only allows char so we need
 +         // to kill the "s" manually
 +         if (list[1].size() > 1) {
 +            list[1].erase(0, 1);
 +            if(strstr(errormsg, list[0].c_str()) && 
 +               strstr(errormsg, list[1].c_str())) {
 +               std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +               return;
 +            }
 +         }
 +      }
 +   }
 +
     // get the pkgname and reportfile
     pkgname = flNotDir(pkgpath);
     pos = pkgname.find('_');
@@@ -1616,24 -1586,6 +1616,24 @@@
        fprintf(report, "DpkgTerminalLog:\n");
        log = fopen(logfile_name.c_str(),"r");
        if(log != NULL)
 +      {
 +       while( fgets(buf, sizeof(buf), log) != NULL)
 +          fprintf(report, " %s", buf);
 +         fprintf(report, " \n");
 +       fclose(log);
 +      }
 +   }
 +
 +   // attach history log it if we have it
 +   string histfile_name = _config->FindFile("Dir::Log::History");
 +   if (!histfile_name.empty())
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "DpkgHistoryLog:\n");
 +      log = fopen(histfile_name.c_str(),"r");
 +      if(log != NULL)
        {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);

diff --combined apt-pkg/indexcopy.cc
index 16f2fee967400cb739a1ede1885cade30c9e4bd6,aa1f01a4a799b263ccf4d1c1c53ed91952509ee8..c0a0853161cbf883c75361fc5a96f5f6fc269779
--- 1/apt-pkg/indexcopy.cc
--- 2/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@@ -350,9 -350,6 +350,6 @@@ bool IndexCopy::ReconstructChop(unsigne
   */
  void IndexCopy::ConvertToSourceList(string CD,string &Path)
  {
-    char S[300];
-    snprintf(S,sizeof(S),"binary-%s",_config->Find("Apt::Architecture").c_str());
-    
     // Strip the cdrom base path
     Path = string(Path,CD.length());
     if (Path.empty() == true)
@@@ -388,7 -385,13 +385,13 @@@
         return;
        string Binary = string(Path,Slash+1,BinSlash - Slash-1);
        
-       if (Binary != S && Binary != "source")
+       if (strncmp(Binary.c_str(), "binary-", strlen("binary-")) == 0)
+       {
+        Binary.erase(0, strlen("binary-"));
+        if (APT::Configuration::checkArchitecture(Binary) == false)
+           continue;
+       }
+       else if (Binary != "source")
         continue;
  
        Path = Dist + ' ' + Comp;
@@@ -494,17 -497,20 +497,20 @@@ bool SourceCopy::RewriteEntry(FILE *Tar
  bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
  {
     const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
+    bool const Debug = _config->FindB("Debug::aptcdrom",false);
  
-    // we skip non-existing files in the verifcation to support a cdrom
-    // with no Packages file (just a Package.gz), see LP: #255545
-    // (non-existing files are not considered a error)
+    // we skip non-existing files in the verifcation of the Release file
+    // as non-existing files do not harm, but a warning scares people and
+    // makes it hard to strip unneeded files from an ISO like uncompressed
+    // indexes as it is done on the mirrors (see also LP: #255545 )
     if(!RealFileExists(prefix+file))
     {
-       _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
+       if (Debug == true)
+        cout << "Skipping nonexistent in " << prefix << " file " << file << std::endl;
        return true;
     }
  
-    if (!Record) 
+    if (!Record)
     {
        _error->Warning(_("Can't find authentication record for: %s"), file.c_str());
        return false;
@@@ -516,7 -522,7 +522,7 @@@
        return false;
     }
  
-    if(_config->FindB("Debug::aptcdrom",false)) 
+    if(Debug == true)
     {
        cout << "File: " << prefix+file << endl;
        cout << "Expected Hash " << Record->Hash.toStr() << endl;
@@@ -648,12 -654,16 +654,12 @@@ bool SigVerify::RunGPGV(std::string con
  {
     if (File == FileGPG)
     {
 -      #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n"
 -      char buffer[sizeof(SIGMSG)];
        FILE* gpg = fopen(File.c_str(), "r");
        if (gpg == NULL)
         return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
 -      char const * const test = fgets(buffer, sizeof(buffer), gpg);
        fclose(gpg);
 -      if (test == NULL || strcmp(buffer, SIGMSG) != 0)
 +      if (!StartsWithGPGClearTextSignature(File))
         return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
 -      #undef SIGMSG
     }
  
  

diff --combined apt-pkg/packagemanager.cc
index 97a3c8c884eacf7f5619606457bd43da56e5bd62,9ca6098fd3715746d96479c0ef26d101c684bd8a..ed817934bd707aee5cd3eb84a15112d6539d38b3
--- 1/apt-pkg/packagemanager.cc
--- 2/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@@ -338,7 -338,7 +338,7 @@@ bool pkgPackageManager::SmartConfigure(
        however if there is a loop (A depends on B, B depends on A) this will not 
        be the case, so check for dependencies before configuring. */
     bool Bad = false, Changed = false;
 -   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
 +   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
     unsigned int i=0;
     do
     {
@@@ -602,7 -602,7 +602,7 @@@ bool pkgPackageManager::SmartUnPack(Pkg
        This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
        or by the ConfigureAll call at the end of the for loop in OrderInstall. */
     bool Changed = false;
 -   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
 +   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
     unsigned int i = 0;
     do 
     {
@@@ -856,7 -856,10 +856,10 @@@
         This way we avoid that M-A: enabled packages are installed before
         their older non-M-A enabled packages are replaced by newer versions */
        bool const installed = Pkg->CurrentVer != 0;
-       if (installed == true && Install(Pkg,FileNames[Pkg->ID]) == false)
+       if (installed == true &&
+         (instVer != Pkg.CurrentVer() ||
+          ((Cache[Pkg].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)) &&
+         Install(Pkg,FileNames[Pkg->ID]) == false)
         return false;
        for (PkgIterator P = Pkg.Group().PackageList();
           P.end() == false; P = Pkg.Group().NextPkg(P))
@@@ -882,7 -885,9 +885,9 @@@
        }
     }
     // packages which are already unpacked don't need to be unpacked again
-    else if (Pkg.State() != pkgCache::PkgIterator::NeedsConfigure && Install(Pkg,FileNames[Pkg->ID]) == false)
+    else if ((instVer != Pkg.CurrentVer() ||
+            ((Cache[Pkg].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)) &&
+           Install(Pkg,FileNames[Pkg->ID]) == false)
        return false;
  
     if (Immediate == true) {

diff --combined debian/changelog
index 48c08a1e061e30e8334ba8c8ffd6d2f9de6ef230,e62f0b68141e39d89705c04b72a93abdda538155..7ee04b21b81d8394629daa698e2b37ddd3525969
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,35 +1,62 @@@
-   Merged from lp:~donkult/apt/experimental
 +apt (0.9.7.5ubuntu2) UNRELEASED; urgency=low
 +
++  Merged from lp:~donkult/apt/experimental, 
++              sftp://bzr.debian.org/bzr/apt/apt/debian-sid
 +  
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +  
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - merge fix for LP: #346386 
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +
 +apt (0.9.7.5ubuntu1) quantal; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged latest fixes from the debian-sid branch
 +  
 +  [ TJ ]
 +  * apt-pkg/contrib/netrc.cc:
 +    - increase LOGINSIZE/PASSWORDSIZE limits and add proper error
 +      if the limits are reached (LP: #1008289)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Aug 2012 12:06:48 +0200
 +
  apt (0.9.7.5) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]
    * Japanese (KURASAWA Nozomu) (Closes: #684435)
  
-  -- Christian Perrier <bubulle@debian.org>  Fri, 10 Aug 2012 07:52:17 +0200
+   [ David Kalnischkies ]
+   * apt-pkg/cdrom.cc:
+     - copy only configured translation files from a CD-ROM and not all
+       available translation files preventing new installs with d-i from
+       being initialized with all translations (Closes: #678227)
+     - handle Components in the reduction for the source.list as multi-arch CDs
+       otherwise create duplicated source entries (e.g. "wheezy main main")
+   * apt-pkg/packagemanager.cc:
+     - unpack versions only in case a different version from the package
+       is currently in unpack state to recover from broken system states
+       (like different file in M-A:same package and other dpkg errors)
+       and avoid re-unpack otherwise (Closes: #670900)
+   * debian/control:
+     - let libapt-pkg break apt < 0.9.4 to ensure that the installed http-
+       method supports the new redirection-style, thanks to Raphael Geissert
+       for reporting & testing (Closes: #685192)
+   * doc/apt_preferences.5.xml:
+     - use the correct interval (x <= P < y) for pin value documentation as
+       these are the intervals used by the code (Closes: #685989)
+   * apt-pkg/indexcopy.cc:
+     - do not create duplicated flat-archive CD-ROM sources for foreign
+       architectures on multi-arch CD-ROMs
+     - do not warn about files which have a record in the Release file, but
+       are not present on the CD to mirror the behavior of the other methods
+       and to allow uncompressed indexes to be dropped without scaring users
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 26 Aug 2012 10:49:17 +0200
  
  apt (0.9.7.4) unstable; urgency=low
  
@@@ -133,19 -133,6 +160,19 @@@ apt (0.9.7.2) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 13 Jul 2012 21:33:56 +0200
  
 +apt (0.9.7.1ubuntu2) quantal; urgency=low
 +
 +  * ftparchive/override.cc:
 +    - Double maximum override line length to 1000 (LP: #1038961).
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Mon, 20 Aug 2012 12:04:30 +0100
 +
 +apt (0.9.7.1ubuntu1) quantal; urgency=low
 +
 +  * merged from the debian-sid branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Jun 2012 15:33:42 +0200
 +
  apt (0.9.7.1) unstable; urgency=low
  
    [ Program translation updates ]
@@@ -204,44 -191,6 +231,44 @@@ apt (0.9.7) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Tue, 19 Jun 2012 16:42:43 +0200
  
 +apt (0.9.6ubuntu3) quantal; urgency=low
 +
 +  * SECURITY UPDATE: Disable apt-key net-update for now, as validation
 +    code is still insecure
 +    - cmdline/apt-key: exit 1 immediately in net_update()
 +    - CVE-2012-0954
 +    - LP: #1013639
 +
 + -- Jamie Strandboge <jamie@ubuntu.com>  Fri, 15 Jun 2012 08:03:17 -0500
 +
 +apt (0.9.6ubuntu2) quantal; urgency=low
 +
 +  * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to
 +    Marc Deslauriers. (LP: #1013128)
 +
 + -- Jamie Strandboge <jamie@ubuntu.com>  Thu, 14 Jun 2012 11:29:48 -0500
 +
 +apt (0.9.6ubuntu1) quantal; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from Debian, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +    - APT::pkgPackageManager::MaxLoopCount set to 5000
 +    - apport pkgfailure handling
 +    - ubuntu changelog download handling
 +    - patch for apt cross-building, see http://bugs.debian.org/666772
 +
 +  [ Steve Langasek ]
 +  * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
 +    removed in previous LTS.
 +  * prepare-release: declare the packages needed as source build deps.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Jun 2012 22:36:16 +0000
 +
  apt (0.9.6) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -752,152 -701,6 +779,152 @@@ apt (0.8.16~exp13) experimental; urgenc
  
   -- Michael Vogt <mvo@debian.org>  Tue, 06 Mar 2012 18:12:57 +0100
  
 +apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low
 +
 +  [ Malcolm Scott ]
 +  * apt-pkg/packagemanager.cc:
 +    - Fix a regression in the pre-depend handling: where a pre-depend option
 +      other than the first specified is already installed, apt-get enters an
 +      infinite loop (LP: #985852)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.cc:
 +    - add APT::pkgPackageManager::MaxLoopCount to ensure that the
 +      ordering code does not get into a endless loop when it flip-flops
 +      between two states
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/cacheset.cc:
 +    - actually return to the fallback modifier if we have detected we
 +      should for packagenames which look like modifiers (Closes: #669591)
 +      LP: #982716
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 20 Apr 2012 11:10:12 +0200
 +
 +apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
 +
 +  * apt-inst/contrib/extracttar.cc:
 +    - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
 +      that the pipe is closed when InFd is closed. This fixes a Fd leak
 +      (LP: #985452)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Apr 2012 11:38:43 +0200
 +
 +apt (0.8.16~exp12ubuntu8) precise; urgency=low
 +
 +  * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Thu, 12 Apr 2012 16:26:20 -0600
 +
 +apt (0.8.16~exp12ubuntu7) precise; urgency=low
 +
 +  * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
 +    dropped in maverick.
 +  * Build-depend on gettext:any for cross-building support.
 +  * Don't treat build-depends-indep as cross-build-dependencies; we should
 +    always install the host arch versions.  LP: #968828.
 +  * Makefile, po/makefile:  make sure our pot generation datestamp doesn't
 +    change at build time, since this makes translations fail to be
 +    co-installable with multiarch.  Based on a patch by David Kalnischkies.
 +    Closes: #659333, LP: #924628.
 +  * For cross-build-dependencies, Architecture: all packages should be
 +    treated as implicitly Multi-Arch: foreign, because either they *are*
 +    M-A: foreign when used as a build-dependency, or they need to be updated
 +    to not be Architecture: all; and since cross-build-deps are new
 +    functionality in apt, we can safely make this change without breaking
 +    existing systems.  Closes: #666772.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 05 Apr 2012 18:00:23 -0700
 +
 +apt (0.8.16~exp12ubuntu6) precise; urgency=low
 +
 +  * cherry pick from
 +    http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/:
 +    * apt-pkg/packagemanager.cc:
 +      - fix bug in predepends handling - ensure that packages that needs
 +        unpackaging are unpacked before they are configured (LP: #927993)
 +    * apt-pkg/packagemanager.cc:
 +      - do not try to a void a breaks if the broken package pre-depends
 +        on the breaker, but let dpkg auto-deconfigure it
 +    * apt-pkg/packagemanager.cc:
 +      - recheck all dependencies if we changed a package in SmartConfigure
 +        as this could break an earlier dependency (LP: #940396)
 +    * recheck dependencies in SmartUnpack after a change, too
 +    * add Debug::pkgAcqArchive::NoQueue to disable package downloading
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Mar 2012 19:46:08 +0100
 +
 +apt (0.8.16~exp12ubuntu5) precise; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from the debian-sid branch, most notably:
 +    - Correct fi translation for hash sum mismatches (LP: #420403)
 +      Thanks to Jani Uusitalo
 +    - remove 'old' InRelease file if we can't get a new one before
 +      proceeding with Release.gpg to avoid the false impression of a still
 +      trusted repository by a (still present) old InRelease file.
 +      Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 06 Mar 2012 17:52:50 +0100
 +
 +apt (0.8.16~exp12ubuntu4) precise; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.h:
 +    - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Feb 2012 10:06:28 +0100
 +
 +apt (0.8.16~exp12ubuntu3) precise; urgency=low
 +
 +  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
 +    handle compressed files again (LP: #924182).
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Tue, 31 Jan 2012 11:19:46 +0000
 +
 +apt (0.8.16~exp12ubuntu2) precise; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - chroot if needed before dpkg --assert-multi-arch
 +    - ensure that dpkg binary doesn't have the chroot-directory prefixed
 +  * apt-pkg/depcache.cc:
 +    - if a M-A:same package is marked for reinstall, mark all it's installed
 +      silbings for reinstallation as well (LP: #859188)
 +  * apt-pkg/contrib/configuration.cc:
 +    - do not stop parent transversal in FindDir if the value is empty
 +  * methods/http{s,}.cc:
 +    - if a file without an extension is requested send an 'Accept: text/*'
 +      header to avoid that the server chooses unsupported compressed files
 +      in a content-negotation attempt (Closes: #657560)
 +  * apt-pkg/aptconfiguration.cc:
 +    - chroot if needed before calling dpkg --print-foreign-architectures
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix crash when a package is in removed but residual config state
 +      (LP: #923807)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Jan 2012 21:03:12 +0100
 +
 +apt (0.8.16~exp12ubuntu1) precise; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merge from debian/experimental:
 +    - new ABI
 +
 +  [ Steve Langasek ]
 +  * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
 +    we resolve virtual package Breaks more effectively.  Thanks to Colin
 +    Watson for the patch.  Closes: #657695, LP: #922485.
 +  * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
 +    a signed short, because large upgrades can result in an overflow for
 +    core packages.  Thanks again to Colin Watson.  Closes: #657732,
 +    LP: #917173.
 +  * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
 +    Closes: #646288.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 29 Jan 2012 00:44:16 +0000
 +
  apt (0.8.16~exp12) experimental; urgency=low
  
    [ Michael Vogt ]
@@@ -955,10 -758,10 +982,10 @@@ apt (0.8.16~exp10) experimental; urgenc
    * apt-pkg/contrib/fileutl.h:
      - store the offset in the internal fd before calculate size of
        the zlib-handled file to jump back to this place again
 -  * apt-pkg/aptconfiguration.cc:
 -    - parse dpkg --print-foreign-architectures correctly in
 -      case archs are separated by newline instead of space, too.
 -      (Closes: #655590)
 +  [ David Kalnischkies ]
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/fileutl.h:
 +    - fix segfault triggered by the python-apt testsuite
  
    [ Michael Vogt ]
    * apt-pkg/contrib/fileutl.h:
@@@ -993,7 -796,6 +1020,7 @@@ apt (0.8.16~exp9) experimental; urgency
        commands accepting lists of packages, e.g. policy (Closes: #625960)
    * apt-pkg/depcache.cc:
      - prefer native providers over foreigns even if the chain is foreign
 +      LP: #850264.
    * cmdline/apt-get.cc:
      - ignore foreign architectures if we check if a provides has only one
        resolver as it's basically the same for the user, so no need to choose
@@@ -1091,198 -893,15 +1118,198 @@@ apt (0.8.16~exp6) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
  
 +apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low
 +
 +  [ Daniel Hahler ]
 +  * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Oct 2011 10:58:20 +0200
 +
 +apt (0.8.16~exp5ubuntu14.2) precise; urgency=low
 +
 +  * Call update-apt-xapian-index with -u on all arches in
 +    cron.daily to make it behave slightly more pleasantly.
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Mon, 09 Jan 2012 07:41:03 -0700
 +
 +apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
 +
 +  * apt-pkg/edsp.cc:
 +    - fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Oct 2011 17:56:49 +0200
 +
 +apt (0.8.16~exp5ubuntu14) precise; urgency=low
 +  
 +  [ David Kalnischkies ]  
 +  * apt-pkg/pkgcachegen.cc:
 +    - refactor MergeList by creating -Group, -Package and -Version specialist
 +    - share description list between "same" versions (LP: #868977)
 +      This also means that descriptions are shared across archives now.
 +  * apt-pkg/pkgcache.cc:
 +    - always prefer "en" over "" for "en"-language regardless of cache-order
 +      (LP: #868977)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Oct 2011 16:22:31 +0200
 +
 +apt (0.8.16~exp5ubuntu13) oneiric; urgency=low
 +
 +  [ Adam Conrad ]
 +  * On armel, call update-apt-xapian-index with '-u' to keep the CPU
 +    and I/O usage low.  We would do this on all arches, but there's a
 +    regression risk here, but that's better than killing slow systems.
 +  
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - fix apt-key net-update, thanks to Marc Deslauriers and 
 +      Adam Conrad for the code review (LP: #857472)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 06 Oct 2011 16:14:41 +0200
 +
 +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
 +
 +  [ David Kalnischkies ]  
 +  * apt-pkg/deb/deblistparser.cc:
 +    - fix crash when the dynamic mmap needs to be remapped during
 +      LoadReleaseInfo (LP: #854090)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Sep 2011 13:31:11 +0200
 +
 +apt (0.8.16~exp5ubuntu11) oneiric; urgency=low
 +
 +  [ Colin Watson ]
 +  * ftparchive/cachedb.cc:
 +    - fix buffersize in bytes2hex
 +  
 +  [ Marc Deslauriers ]
 +  * SECURITY UPDATE: Disable apt-key net-update for now, as validation
 +    code is insecure.
 +    - cmdline/apt-key: exit immediately out of net_update().
 +    - CVE number pending
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 22 Sep 2011 17:30:45 +0200
 +
 +apt (0.8.16~exp5ubuntu10) oneiric; urgency=low
 +
 +  * methods/https.cc:
 +    - cleanup broken downloads properly (just like http)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 20 Sep 2011 18:26:13 +0200
 +
 +apt (0.8.16~exp5ubuntu9) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
 +    - fix fetching translated package descriptions (including the newly
 +      stripped out english ones) by adding OptionalSubIndexTarget
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/acquire-item.cc:
 +    - if no Release.gpg file is found try to verify with hashes,
 +      but do not fail if a hash can't be found
 +  * apt-pkg/indexrecords.cc:
 +    - fix Acquire::Max-ValidTime option by interpreting it really
 +      as seconds as specified in the manpage and not as days
 +    - add an Acquire::Min-ValidTime option (Closes: #640122)
 +  * doc/apt.conf.5.xml:
 +    - reword Acquire::Max-ValidTime documentation to make clear
 +      that it doesn't provide the new Min-ValidTime functionality
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 16 Sep 2011 09:50:16 +0200
 +
 +apt (0.8.16~exp5ubuntu8) oneiric; urgency=low
 +
 +  * cherry pick r1825 from lp:~mvo/apt/mvo:
 +    * apt-pkg/contrib/configuration.cc:
 +    - fix double delete (LP: #848907)
 +    - ignore only the invalid regexp instead of all options
 +
 +  * cherry pick r2165 from lp:~donkult/apt/sid:
 +    [ David Kalnischkies ]
 +    * cmdline/apt-get.cc:
 +      - output list of virtual package providers to c1out in -q=1
 +        instead of /dev/null to unbreak sbuild (LP: #816155)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 18:23:09 +0200
 +
 +apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cherry pick revision 2173 from lp:~donkult/apt/sid
 +  
 +  [ David Kalnischkies ]
 +  - M-A:same lockstep unpack should operate on installed
 +    packages first (LP: #835625)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 09:03:33 +0200
 +
 +apt (0.8.16~exp5ubuntu6) oneiric; urgency=low
 +
 +  [ Michael Vogt 
 +  * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
 +    Jonathan Riddell
 +  
 +  [ David Kalnischkies ]
 +  * lots of cppcheck fixes
 +  * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
 +    - ignore "self"-conflicts for all architectures of a package
 +      instead of just for the architecture of the package locked at
 +      in the ordering of installations too (Closes: #802901)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Aug 2011 11:32:58 +0200
 +
 +apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
 +
 +  * debian/control:
 +    - fix VCS location
 +  * methods/mirror.cc:
 +    - include the architecture(s) in the query string as well so 
 +      that the server can make better decisions
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Aug 2011 18:03:19 +0200
 +
 +apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
 +
 +  * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
 +    to a hard dependency to match Debian behaviour and fix LP: #816606
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 Aug 2011 14:48:24 -0600
 +
 +apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
 +
 +  * apt-pkg/acquire.cc:
 +    - fix potential divide-by-zero (LP: #823277)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Aug 2011 15:56:44 +0200
 +
 +apt (0.8.16~exp5ubuntu2) oneiric; urgency=low
 +
 +  * test/integration/test-hashsum-verification:
 +    - add regression test for hashsum verification
 +  * apt-pkg/acquire-item.cc:
 +    - if no Release.gpg file is found, still load the hashes for
 +      verification (closes: #636314) and add test
 +  * apt-pkg/pkgcachegen.cc:
 +    - fix incorrect comparision when checking sources.list freshness
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Aug 2011 09:22:14 +0200
 +
 +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low
 +
 +  * merged new version from debian/experimental, this includes
 +    a ABI break and two new library packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 08 Aug 2011 14:30:07 +0200
 +
  apt (0.8.16~exp5) experimental; urgency=low
  
 -  * merged the latest debian-sid fixes
    * apt-pkg/makefile:
      - install sha256.h compat header
    * apt-pkg/pkgcachegen.{cc,h}:
      - use ref-to-ptr semantic in NewDepends() to ensure that the   
        libapt does not segfault if the cache is remapped in between
        (LP: #812862)
 +      (LP: #812862)
      - fix crash when P.Arch() was used but the cache got remapped
    * apt-pkg/acquire-item.{cc,h}:
      - do not check for a "Package" tag in optional index targets
@@@ -1408,10 -1027,6 +1435,10 @@@ apt (0.8.15.10) unstable; urgency=hig
      - show a debug why a package was kept by ResolveByKeep()
    * doc/manpage-style.xml:
      - put <brackets> around email addresses
 +  * apt-pkg/aptconfiguration.cc:
 +    - parse dpkg --print-foreign-architectures correctly in
 +      case archs are separated by newline instead of space, too.
 +      (Closes: #655590)
    * doc/po/de.po:
      - apply typo-fix from Michael Basse, thanks! (LP: #900770)
    * apt-pkg/acquire-item.cc:
@@@ -1435,8 -1050,8 +1462,8 @@@
    * French: replace "étiquetage" by "épinglage" for "pinning"
  
    [ Michael Vogt ]
 -  * merged patch from lp:~uusijani/apt/uusi-branch:
 -     Correct fi translation for hash sum mismatches (lp:420403)
 +  * merged patch from lp:~uusijani/apt/uusi-branch: 
 +     Correct fi translation for hash sum mismatches (LP: #420403)
       Thanks to Jani Uusitalo
  
   -- Michael Vogt <mvo@debian.org>  Tue, 06 Mar 2012 14:14:26 +0100
@@@ -1564,14 -1179,6 +1591,14 @@@ apt (0.8.15.6) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
  
 +apt (0.8.15.5ubuntu1) oneiric; urgency=low
 +
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - fix crash when P.Arch() was used but the cache got remapped
 +      (LP: #812862)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Aug 2011 15:18:50 +0200
 +
  apt (0.8.15.5) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -1580,28 -1187,6 +1607,28 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:49:15 +0200
  
 +apt (0.8.15.4ubuntu2) oneiric; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.{cc,h}:
 +    - add GetModificationTime() helper
 +  * apt-pkg/pkgcachegen.cc:
 +    - regenerate the cache if the sources.list changes to ensure
 +      that changes in the ordering there will be honored by apt
 +  * apt-pkg/sourcelist.{cc,h}:
 +    - add pkgSourceList::GetLastModifiedTime() helper
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Jul 2011 18:25:22 +0200
 +
 +apt (0.8.15.4ubuntu1) oneiric; urgency=low
 +
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2011 13:19:49 +0200
 +
  apt (0.8.15.4) unstable; urgency=low
  
    [ David Miller ]
@@@ -1666,70 -1251,19 +1693,70 @@@ apt (0.8.15.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 25 Jul 2011 15:04:43 +0200
  
 -apt (0.8.15.2) unstable; urgency=high
 +apt (0.8.15.2ubuntu2) oneiric; urgency=low
  
 -  * fix from David Kalnischkies for the InRelease gpg verification 
 -    code (LP: #784473)
 +  * cmdline/apt-get.cc:
 +    - fix missing download progress in apt-get download
  
 - -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 22 Jul 2011 13:20:49 +0200
  
 -apt (0.8.15.1) unstable; urgency=low
 +apt (0.8.15.2ubuntu1) oneiric; urgency=low
  
 -  [ David Kalnischkies ]
 -  * doc/makefile:
 -    - create doxygen directory to avoid depending on magic (Closes: #628799)
 -  * cmdline/apt-key:
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - improve error message for a expired Release file
 +  * apt-pkg/algorithms.cc:
 +    - Hold back packages that would enter "policy-broken" state on upgrade
 +      when doing a "apt-get upgrade"
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +  * apt-pkg/depcache.cc:
 +    - change default of APT::AutoRemove::SuggestsImportant to true
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Jul 2011 10:16:45 +0200
 +
 +apt (0.8.15.2) unstable; urgency=high
 +
 +  * fix from David Kalnischkies for the InRelease gpg verification 
 +    code (LP: #784473)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
 +
 +apt (0.8.15.1ubuntu2) oneiric; urgency=low
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - do not report errors encountered when decompressing packages
 +  
 +  [ Michael Vogt ]
 +  * fix from David Kalnischkies for the InRelease gpg verification 
 +    code (LP: #784473)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Jul 2011 14:42:02 +0200
 +
 +apt (0.8.15.1ubuntu1) oneiric; urgency=low
 +
 +  * merge from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:16:12 +0100
 +
 +apt (0.8.15.1) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * doc/makefile:
 +    - create doxygen directory to avoid depending on magic (Closes: #628799)
 +  * cmdline/apt-key:
      - explicitly state that net-update is not supported if no url is set
      - require to be root for add, rm, update and net-update
      - clarify update vs. net-update in different distros (Closes: #632043)
@@@ -1747,17 -1281,6 +1774,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
  
 +apt (0.8.15ubuntu1) oneiric; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:  
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 29 Jun 2011 09:03:39 +0100
 +
  apt (0.8.15) unstable; urgency=low
  
    [ Julian Andres Klode ]
@@@ -2046,101 -1569,6 +2073,101 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
  
 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.conf.changelog:
 +    - add missing ";", thanks to Julian Andres Klode
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - updated allocate memory string
 +    - cannot access archive string is lowercase
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
 +      attachments
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 15 Jun 2011 14:00:43 -0700
 +
 +apt (0.8.14.1ubuntu7) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/deblistparser.cc:
 +    - include all known languages when building the apt cache
 +      (LP: #794907)
 +  * apt-pkg/deb/debindexfile.cc:
 +    - remove some no longer valid checks for "TranslationsAvailable()"
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Jun 2011 13:56:25 +0200
 +
 +apt (0.8.14.1ubuntu6) oneiric; urgency=low
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - prevent reporting of package installation failures due to inaccessible
 +      local files (LP: #791102, #790040)
 +    - include /var/log/apt/history.log in apport-package reports so we know
 +      the context for the package management request
 +    
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Jun 2011 15:55:07 +0200
 +
 +apt (0.8.14.1ubuntu5) oneiric; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - do not reject empty Packages files when checking them for
 +      correctness
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 May 2011 10:41:30 +0200
 +
 +apt (0.8.14.1ubuntu4) oneiric; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 May 2011 17:12:27 +0200
 +
 +apt (0.8.14.1ubuntu3) oneiric; urgency=low
 +
 +  * Rebuild with recent binutils. LP: #774175.
 +
 + -- Matthias Klose <doko@ubuntu.com>  Mon, 23 May 2011 19:15:34 +0200
 +
 +apt (0.8.14.1ubuntu2) oneiric; urgency=low
 +
 +  * debian/rules:
 +    - build in verbose mode by default (thanks to Matthias Klose)
 +  * debian/control:
 +    - add  temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 May 2011 13:58:10 +0200
 +
 +apt (0.8.14.1ubuntu1) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Apr 2011 17:55:20 +0200
 +
  apt (0.8.14.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc:
@@@ -2183,42 -1611,6 +2210,42 @@@ apt (0.8.14) unstable; urgency=lo
  
   -- Julian Andres Klode <jak@debian.org>  Fri, 15 Apr 2011 14:28:15 +0200
  
 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - stop reporting of apport-package bug reports regarding
 +      dpkg I/O errors (LP: #767776)
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 20 Apr 2011 15:05:12 -0700
 +
 +apt (0.8.13.2ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - run unattended-upgrades even if there was a error during
 +      the apt-get update (LP: #676295)
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/indexcopy.cc:
 +    - Use RealFileExists() instead of FileExists(), allows amongst other
 +      things a directory named Sources to exist on a CD-ROM (LP: #750694).
 +  
 +  [ David Kalnischkies  ]
 +  * apt-pkg/pkgcache.cc:
 +    - use the native Architecture stored in the cache header instead of
 +      loading it from configuration as suggested by Julian Andres Klode
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Apr 2011 12:52:21 +0200
 +
 +apt (0.8.13.2ubuntu1) natty; urgency=low
 +
 +  * merge fixes from debian-sid, most notable the handling of
 +    arch=all architectures in python-apt (LP: #733741)
 +  * apt-pkg/aptconfiguration.cc:
 +    - fix comparing for a empty string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 13:19:56 +0200
 +
  apt (0.8.13.2) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -2255,12 -1647,6 +2282,12 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 05 Apr 2011 09:40:28 +0200
  
 +apt (0.8.13.1ubuntu1) natty; urgency=low
 +
 +  * merged fixes from the debian-sid (LP: #744832)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Apr 2011 14:40:51 +0200
 +
  apt (0.8.13.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc: Use stat buffer if stat was
@@@ -2268,24 -1654,6 +2295,24 @@@
  
   -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
  
 +apt (0.8.13ubuntu2) natty; urgency=low
 +
 +  * po/makefile:
 +    - add hack to run MSGMERGE again if it segfaults. this is to help
 +      powerpc to bootstrap
 +  * mirror method:
 +    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
 +    - do not crash if the mirror file fails to download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Mar 2011 18:01:38 +0100
 +
 +apt (0.8.13ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the
 +    apt mirror method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 08:23:19 +0100
 +
  apt (0.8.13) unstable; urgency=low
  
    [ Thorsten Spindler ]
@@@ -2307,29 -1675,6 +2334,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
  
 +apt (0.8.12ubuntu2) unstable; urgency=low
 +
 +  [ Thorsten Spindler ]
 +  * methods/rsh.cc
 +    - fix rsh/ssh option parsing (LP: #678080), thanks to
 +      Ville Mattila 
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - mark pkgAcqIndexTrans as Index-File to avoid asking the
 +      user to insert the CD on each apt-get update
 +  * methods/mirror.cc:
 +    - improve debug output and fix bug in TryNextMirror
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 +
 +apt (0.8.12ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the udev based
 +    cdrom handling and multiarch handling
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 16:12:22 +0100
 +
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -2383,23 -1728,6 +2410,23 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 10 Mar 2011 14:46:48 +0100
  
 +apt (0.8.11.5ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debindexfile.cc:
 +    - ignore missing deb-src files in /var/lib/apt/lists, thanks
 +      to Thorsten Spindler (LP: #85590)
 +  * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
 +    - honor Dpkg::Chroot-Directory in the RunScripts*() methods
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Mar 2011 17:39:30 +0100
 +
 +apt (0.8.11.5ubuntu1) natty; urgency=low
 +
 +  * Merged from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Feb 2011 12:01:19 +0100
 +
  apt (0.8.11.5) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2631,27 -1959,6 +2658,27 @@@ apt (0.8.10.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 17 Jan 2011 13:41:04 +0100
  
 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - ignore lzma "Cannot allocate memory" errors, thanks to Brian
 +      Murray
 +    - add i18n support for the "short read in buffer_copy %s" handling
 +      from dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Jan 2011 18:26:05 +0100
 +
 +apt (0.8.10ubuntu1) natty; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * cmdline/apt-cache.cc: Create an error for apt-cache depends
 +    if packages could not found (LP: #647045)
 +  
 +  [ Michael Vogt ]
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Dec 2010 15:53:49 +0100
 +
  apt (0.8.10) unstable; urgency=low
  
    [ Programs translations ]
@@@ -2671,48 -1978,6 +2698,48 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 30 Nov 2010 10:42:17 +0100
  
 +apt (0.8.9ubuntu4) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - set timeout of wget for net-update to 90 seconds (thanks to \sh)
 +
 +  [ Martin Pitt ]
 +  * Revert r1819 and r1820 to disable compressed indexes by default again.
 +    Testing has brought up a few places where this seriously degrades
 +    performance, mostly in applications which iterate through all available
 +    package records, like update-apt-xapian-index or synaptic. See
 +    https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 25 Nov 2010 08:50:37 +0100
 +
 +apt (0.8.9ubuntu3) natty; urgency=low
 +
 +  * methods/http.cc:
 +    - do not hang if Acquire::http::ProxyAutoDetect can not be
 +      executed or returns no data (LP: #654393)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:42:50 +0100
 +
 +apt (0.8.9ubuntu2) natty; urgency=low
 +
 +  * drop apt-changelog, apt-get changelog implements all the 
 +    features it provides
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:22:40 +0100
 +
 +apt (0.8.9ubuntu1) natty; urgency=low
 +
 +  * re-merged from the debian-sid bzr branch
 +  * merged lp:~mvo/apt/mvo, this brings two new commands:
 +    - apt-get download binary-pkgname to download a deb
 +    - apt-get changelog binary-pkgname to display the changelog
 +  * cmdline/apt-get.cc:
 +    - if the changelog download failed, do not show the generic error
 +      but point to launchpad instead
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:02:14 +0100
 +
  apt (0.8.9) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2744,47 -2009,6 +2771,47 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Nov 2010 09:25:04 +0100
  
 +apt (0.8.8ubuntu3) natty; urgency=low
 +
 +  * cmdline/apt-changelog: Filter out multiple results for a source package,
 +    just take the latest one.
 +  * cmdline/apt-changelog: Read server name from configuration
 +    APT::Changelog::Server instead of hardcoding it. This allows local users
 +    to point to a local changelog mirror, or make this script work for Debian.
 +  * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
 +    server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
 +  * doc/apt-changelog.1.xml: Document the new option.
 +  * test/integration/test-compressed-indexes, test/test-indexes.sh:
 +    - Explicitly disable compressed indexes at the start. This ensures that we
 +      will actually test uncompressed indexes regardless of the internal
 +      default value of Acquire::GzipIndexes.
 +  * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
 +    store compressed indexes. This feature is now mature enough for general
 +    consumption. Update doc/apt.conf.5.xml accordingly.
 +  * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
 +    to preferring "gz", so that compressed indexes will actually work.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Nov 2010 12:14:15 +0100
 +
 +apt (0.8.8ubuntu2) natty; urgency=low
 +
 +  * Add cmdline/apt-changelog: Script to fetch package changelog from
 +    changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
 +  * Add doc/apt-changelog.1.xml, and install it in debian/rules.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 09 Nov 2010 11:32:27 +0100
 +
 +apt (0.8.8ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Oct 2010 10:07:09 -0400
 +
  apt (0.8.8) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -2804,17 -2028,6 +2831,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 28 Oct 2010 21:22:21 +0200
  
 +apt (0.8.7ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Oct 2010 18:31:17 +0200
 +
  apt (0.8.7) unstable; urgency=low
  
    [ Manpages translations ]
@@@ -2933,119 -2146,33 +2960,119 @@@ apt (0.8.4) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
 -apt (0.8.3) unstable; urgency=low
 +apt (0.8.3ubuntu7) maverick; urgency=low
  
 -  [ Programs translations ]
 -  * German (Holger Wansing). Closes: #596141
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - do not remove packages which the user requested for installation
 +      explicitly while satisfying other install requests (Closes: #598669)
 +    Test case: debootstrap, install exim4, run "apt-get install postfix"
 +    This will result in exim4-heavy instead of postfix
  
 -  [ Manpages translations ]
 -  * Japanese (KURASAWA Nozomu). Closes: #595862
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200
 +
 +apt (0.8.3ubuntu6) maverick; urgency=low
  
    [ Michael Vogt ]
 -  * apt-pkg/indexcopy.cc:
 -    - only use trusted.gpg.d directory if it exists
 -    - do not replace /dev/null when running in APT::CDROM::NoAct
 -      mode (LP: #612666), thanks to Colin Watson
 +  * debian/apt.cron.daily:
 +    - source /etc/default/locale (if available) so that the 
 +      apt-get update cron job fetches the right translated package
 +      descriptions (LP: #652951)
  
    [ David Kalnischkies ]
 -  * ftparchive/apt-ftparchive.cc:
 -    - ensure that BinDirectory as well as Tree settings get
 -      the correct default FileMode setting (Closes: #595922)
 +  * apt-pkg/depcache.cc:
 +    - do not check endpointer packages instead of only those which prevented
 +      NeverAutoRemove settings from having an effect (Closes: #598452)
 +  * cmdline/apt-cache.cc:
 +    - use the TranslatedDescription for searching and not the first
 +      available one as it is maybe not an expected language (Closes: #597925)
  
 - -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
  
 -apt (0.8.2) unstable; urgency=low
 +apt (0.8.3ubuntu5) maverick; urgency=low
  
 -  [ Manpages translations ]
 -  * Spanish (Omar Campagne). Closes: #595557
 +  * debian/apt.dirs:
 +    - add missing /usr/share/apt so that the keyring is installed
 +      into the right place (LP: #620576)
  
 -  [ David Kalnischkies ]
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Sep 2010 18:34:18 +0200
 +
 +apt (0.8.3ubuntu4) maverick; urgency=low
 +
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
 +    with conflicts/breaks against virtual packages (LP: #614993)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Sep 2010 19:48:26 +0200
 +
 +apt (0.8.3ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/cdromutl.cc:
 +    - if apt-cdrom is used on writable media (like usb-sticks), do
 +      not use the root directory to identify the medium (as all 
 +      changes there change the ident id). Use the .disk directory 
 +      instead 
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/writer.cc:
 +    - null the valid string instead of the date if Valid-Until is not set
 +  * apt-pkg/acquire-item.cc:
 +    - use also unsigned Release files again (Closes: #596189)
 +
 +  [ Christian Perrier ]
 +  * Fix missing space after dot in a message from apt-pkg
 +    Translations unfuzzied. Thanks to Holger Wansing.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Sep 2010 21:45:49 +0200
 +
 +apt (0.8.3ubuntu2) maverick; urgency=low
 +
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
 +
 +apt (0.8.3ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
 +apt (0.8.3) unstable; urgency=low
 +
 +  [ Programs translations ]
 +  * German (Holger Wansing). Closes: #596141
 +
 +  [ Manpages translations ]
 +  * Japanese (KURASAWA Nozomu). Closes: #595862
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/indexcopy.cc:
 +    - only use trusted.gpg.d directory if it exists
 +    - do not replace /dev/null when running in APT::CDROM::NoAct
 +      mode (LP: #612666), thanks to Colin Watson
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/apt-ftparchive.cc:
 +    - ensure that BinDirectory as well as Tree settings get
 +      the correct default FileMode setting (Closes: #595922)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 +
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
    * apt-pkg/versionmatch.cc:
      - do not accept 'Pin: origin "' (missing closing ") as a valid
        way to pin a local archive: either "" or none…
@@@ -3111,69 -2238,6 +3138,69 @@@ apt (0.8.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
 +apt (0.8.0ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Simplified Chinese (Aron Xu). Closes: #594458
 +  * Bulgarian (Damyan Ivanov). Closes: #594627
 +  * Portuguese (Miguel Figueiredo). Closes: #594668
 +  * Korean (Changwoo Ryu). Closes: #594809
 +
 +  [ Manpages translations ]
 +  * Portuguese (Américo Monteiro)
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-cache.cc:
 +    - remove useless GetInitialize method
 +  * cmdline/apt-get.cc:
 +    - remove direct calls of ReadMainList and use the wrapper instead
 +      to protect us from useless re-reads and two-times notice display
 +    - remove death code by removing unused GetInitialize
 +  * apt-pkg/depcache.cc:
 +    - now that apt-get purge works on 'rc' packages let the MarkDelete
 +      pass this purge forward to the non-pseudo package for pseudos
 +  * apt-pkg/contrib/fileutl.cc:
 +    - apply SilentlyIgnore also on files without an extension
 +  * apt-pkg/contrib/configuration.cc:
 +    - fix autoremove by using correct config-option name and
 +      don't make faulty assumptions in error handling (Closes: #594689)
 +  * apt-pkg/versionmatch.cc:
 +    - let the pin origin actually work as advertised in the manpage
 +      which means "" are optional and pinning a local archive does
 +      work - even if it is a non-flat archive (Closes: #594435)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 17:05:53 +0200
 +
 +apt (0.8.0ubuntu2) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Thai (Theppitak Karoonboonyanan). Closes: #592695
 +  * Russian (Yuri Kozlov). Closes: #594232
 +  * Slovak (Ivan Masár). Closes: #594255
 +  * Swedish (Daniel Nylander). Closes: #594241
 +  * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
 +  * Italian (Milo Casagrande). Closes: #594238
 +  * Asturian (maacub). Closes: #594303
 +
 +  [ Christian Perrier ]
 +  * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
 +    Closes: #594211
 +
 +  [ David Kalnischkies ]
 +  * show in madison command again also source packages (LP: #614589)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Aug 2010 18:56:23 +0200
 +
 +apt (0.8.0ubuntu1) maverick; urgency=low
 +
 +  * merged from debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
 +
  apt (0.8.0) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -3216,20 -2280,6 +3243,20 @@@ apt (0.8.0~pre2) experimental; urgency=
  
   -- Michael Vogt <mvo@debian.org>  Mon, 23 Aug 2010 19:09:08 +0200
  
 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - enable apport reports again (got lost in the previous merge),
 +      thanks to Matt Zimmerman
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Aug 2010 13:53:09 +0200
 +
 +apt (0.8.0~pre1ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian/experimental
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Aug 2010 17:49:40 +0200
 +
  apt (0.8.0~pre1) experimental; urgency=low
  
    [ Programs translations ]
@@@ -3272,56 -2322,6 +3299,56 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 13 Aug 2010 17:00:49 +0200
  
 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Add WriteAtomic mode.
 +    - Revert WriteEmpty to old behavior (LP: #613211)
 +  * apt-pkg, methods:
 +    - Convert users of WriteEmpty to WriteAtomic.
 +  * apt-pkg/depcache.cc:
 +    - Only try upgrade for Breaks if there is a newer version, otherwise
 +      handle it as Conflicts (by removing it) (helps for #591882).
 +  
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - Add recommends on gnupg to apt, apt-key uses it.
 +      (changed from debian)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Aug 2010 12:01:30 +0200
 +
 +apt (0.7.26~exp12ubuntu3) maverick; urgency=low
 +
 +  [ Colin Watson ]
 +  * apt-pkg/cdrom.cc:
 +    - fix off-by-one error in DropBinaryArch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 21:04:18 +0200
 +
 +apt (0.7.26~exp12ubuntu2) maverick; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if ubuntu-keyring is not installed
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 11:47:59 +0200
 +
 +apt (0.7.26~exp12ubuntu1) maverick; urgency=low
 +
 +  * ABI break upload
 +  * merged from debian/experimental, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +  * debian/apt.postinst
 +    - drop set_apt_proxy_from_gconf(), no longer needed in maverick
 +  * apt-pkg/pkgcache.cc:
 +    - re-evaluate the architectures cache when the cache is (re)opened
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 19:32:15 +0200
 +
  apt (0.7.26~exp12) experimental; urgency=low
  
    [ Michael Vogt ]
@@@ -3936,152 -2936,6 +3963,152 @@@ apt (0.7.26~exp1) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 16:11:39 +0100
  
 +apt (0.7.25.3ubuntu10) maverick; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.conf.ubuntu:
 +    - no longer install (empty) apt.conf.d/01ubuntu
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
 +    - fix FTBFS (LP: #600155)
 +
 +  [ Matthias G. ]
 +  * apt-pkg/deb/dpkgpm.cc: 
 +    - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Jul 2010 09:37:03 +0200
 +
 +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if getent returns nothing useful (LP: #579647)
 +      thanks to Jean-Baptiste Lallement
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 14 May 2010 09:40:50 +0200
 +
 +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
 +
 +  [ Loïc Minier ]
 +  * Use https:// in Vcs-Bzr URL.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix max tag buffer size (LP: #545336, closes: #578959)
 +  * apt-pkg/indexfile.cc:
 +    - If no "_" is found in the language code, try to find a "."
 +      This is required for languages like Esperanto that have no
 +      county associated with them (LP: #560956)
 +      Thanks to "Aisano" for the fix
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 10:33:46 +0200
 +
 +apt (0.7.25.3ubuntu7) lucid; urgency=low
 +
 +  Cherry pick fixes from the lp:~mvo/apt/mvo branch:
 +
 +  [ Evan Dandrea ]
 +  * Remember hosts with general failures for
 +    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
 +  
 +  [ Michael Vogt ]
 +  * improve debug output for Debug::pkgPackageManager
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Apr 2010 20:30:03 +0200
 +
 +apt (0.7.25.3ubuntu6) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix crash when pkg.VersionList() is empty (LP: #556056)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Apr 2010 21:13:25 +0200
 +
 +apt (0.7.25.3ubuntu5) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - try version match in FindSrc first exact than fuzzy (LP: #551178)
 +
 +  [ Jean-Baptiste Lallement ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - always escape '%' (LP: #130289) (Closes: #500560)
 +    - unescape '%' sequence only if followed by 2 hex digit
 +    - username/password are urlencoded in proxy string (RFC 3986)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Mar 2010 21:59:42 +0200
 +
 +apt (0.7.25.3ubuntu4) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/debversion.cc:
 +    - consider absent of debian revision equivalent to 0 (Closes: #573592)
 +      LP: #540228
 +  * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
 +   - fix memory leaks in error conditions in DoSource()
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - fix error message construction in OpenLog()
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100
 +
 +apt (0.7.25.3ubuntu3) lucid; urgency=low
 +
 +  * apt-pkg/indexfile.cc:
 +    - remove "cs" from languages that need the full langcode when
 +      downloading translations (thanks to Steve Langasek)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Mar 2010 09:42:39 +0100
 +
 +apt (0.7.25.3ubuntu2) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * abicheck/
 +    - add new abitest tester using the ABI Compliance Checker from
 +      http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
 +  * debian/apt.conf.autoremove:
 +    - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
 +      for transitional packages
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix backgrounding when dpkg runs (closes: #486222)
 +  * cmdline/apt-mark:
 +    - show error on incorrect aguments (LP: #517917), thanks to
 +      Torsten Spindler
 +  * cmdline/apt-get.cc:
 +    - if apt-get source foo=version or foo/distro can not be found,
 +      error out (LP: #502641)
 +  * apt-pkg/indexfile.cc:
 +    - deal correctly with three letter langcodes (LP: #391409)
 +  * debian/apt.cron.daily:
 +    - do not look into admin users gconf anymore for the http proxy
 +      the user now needs to use the "Apply system-wide" UI in the
 +      gnome-control-center to set it
 +  * debian/apt.postinst:
 +    - add set_apt_proxy_from_gconf() and run that once on upgrade if
 +      there is no proxy configured already system-wide (LP: #432631)
 +      From that point on gnome-control-center will have to warn if
 +      the user makes changes to the proxy settings and does not apply
 +      them system wide
 +
 +  [ Robert Collins ]
 +  * Change the package index Info methods to allow apt-cache policy to be
 +    useful when using several different archives on the same host.
 +    (Closes: #329814, LP: #22354)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Mar 2010 23:10:52 +0100
 +
 +apt (0.7.25.3ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged with the debian-sid branch
 +  * methods/http.cc:
 +    - add Acquire::http::ProxyAutoDetect configuration that 
 +      can be used to call a external helper to figure out the 
 +      proxy configuration and return it to apt via stdout
 +      (this is a step towards WPAD and zeroconf/avahi support)
 +  
 +  [ Ivan Masár ]
 +  * Slovak translation update. Closes: #568294
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Feb 2010 23:33:32 +0100
 +
  apt (0.7.25.3) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -4202,57 -3056,24 +4229,57 @@@ apt (0.7.25.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sat, 09 Jan 2010 21:52:36 +0100
  
 -apt (0.7.25) unstable; urgency=low
 +apt (0.7.25ubuntu4) lucid; urgency=low
  
 -  [ Christian Perrier ]
 -  * Fix apt-ftparchive(1) wrt description of the "-o" option.
 -    Thanks to Dann Frazier for the patch. Closes: #273100
 -  * po/LINGUAS. Re-disable Hebrew. Closes: #534992
 -  * po/LINGUAS. Enable Asturian and Lithuanian
 -  * Fix typo in apt-cache.8.xml: nessasarily
 -  * Fix "with with" in apt-get.8.xml
 -  * Fix some of the typos mentioned by the german team
 -    Closes: #479997
 -  * Polish translation update by Wiktor Wandachowicz
 -    Closes: #548571
 -  * German translation update by Holger Wansing
 -    Closes: #551534
 -  * Italian translation update by Milo Casagrande
 -    Closes: #555797
 -  * Simplified Chinese translation update by Aron Xu 
 +  * cmdline/apt-cdrom.cc:
 +    - make Acquire::cdrom::AutoDetect default, this can be
 +      turned off with "--no-auto-detect"
 +  * methods/http.cc:
 +    - add cache-control headers even if no cache is given to allow
 +      adding options for intercepting proxies
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
 +
 +apt (0.7.25ubuntu3) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - don't mark as manually if in download only (Closes: #468180)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 01 Feb 2010 18:41:15 +0100
 +
 +apt (0.7.25ubuntu2) lucid; urgency=low
 +
 +  * Change history branch so that it does not break the 
 +    apt ABI for the pkgPackageManager interface
 +    (can be reverted on the next ABI break)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
 +
 +apt (0.7.25ubuntu1) lucid; urgency=low
 +
 +  * Merged from the mvo branch
 +  * merged from the lp:~mvo/apt/history branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Dec 2009 09:44:08 +0100
 +
 +apt (0.7.25) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Fix apt-ftparchive(1) wrt description of the "-o" option.
 +    Thanks to Dann Frazier for the patch. Closes: #273100
 +  * po/LINGUAS. Re-disable Hebrew. Closes: #534992
 +  * po/LINGUAS. Enable Asturian and Lithuanian
 +  * Fix typo in apt-cache.8.xml: nessasarily
 +  * Fix "with with" in apt-get.8.xml
 +  * Fix some of the typos mentioned by the german team
 +    Closes: #479997
 +  * Polish translation update by Wiktor Wandachowicz
 +    Closes: #548571
 +  * German translation update by Holger Wansing
 +    Closes: #551534
 +  * Italian translation update by Milo Casagrande
 +    Closes: #555797
 +  * Simplified Chinese translation update by Aron Xu 
      Closes: #558737
    * Slovak translation update by Ivan Masár
      Closes: #559277
@@@ -4378,29 -3199,6 +4405,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 15 Dec 2009 09:21:55 +0100
  
 +apt (0.7.24ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - include df -l output in the apport log as well (thanks to
 +      tjaalton)
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
 +  * merge lp:~mvo/apt/netrc branch, this adds support for a
 +    /etc/apt/auth.conf that can be used to store username/passwords
 +    in a "netrc" style file (with the extension that it supports "/"
 +    in a machine definition). Based on the maemo git branch.
 +
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Dec 2009 09:27:26 +0100
 +
  apt (0.7.24) unstable; urgency=low
  
    [ Nicolas François ]
@@@ -4470,59 -3268,6 +4497,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 ]
@@@ -4752,34 -3497,6 +4779,34 @@@ apt (0.7.22) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
  
 +apt (0.7.21ubuntu1) karmic; urgency=low
 +
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Christian Perrier ]
 +  * Documentation translations:
 +    - Fix a typo in apt-get(8) French translation. Closes: #525043
 +      Thanks to Guillaume Delacour for spotting it.
 +  * Translations:
 +    - fr.po
 +    - sk.po. Closes: #525857
 +    - ru.po. Closes: #526816
 +    - eu.po. Closes: #528985
 +    - zh_CN.po. Closes: #531390
 +    - fr.po
 +    - it.po. Closes: #531758
 +    - ca.po. Closes: #531921
 +  * Added translations
 +    - ast.po (Asturian by Marcos Alvareez Costales).
 +      Closes: #529007, #529730
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire.cc:
 +    - make the (internal) max pipeline depth of the acquire queue
 +      configurable via Acquire::Max-Pipeline-Depth
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Jun 2009 15:49:07 +0200
 +
  apt (0.7.21) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -4823,125 -3540,6 +4850,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 ]
@@@ -5010,12 -3608,6 +5037,12 @@@ apt (0.7.20) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
  
 +apt (0.7.19ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
 +
  apt (0.7.19) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
@@@ -5314,90 -3906,6 +5341,90 @@@ apt (0.7.15~exp1) experimental; urgency
    
   -- Michael Vogt <mvo@debian.org>  Tue, 16 Sep 2008 21:27:03 +0200
  
 +apt (0.7.14ubuntu7) jaunty; urgency=low
 +
 +  * cmdline/apt-cache.cc:
 +    - remove the gettext from a string that consists entirely 
 +      of variables (LP: #56792)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix potential hang when in a backgroud process group
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Oct 2008 21:09:12 +0100
 +
 +apt (0.7.14ubuntu6) intrepid; urgency=low
 +
 +  * debian/apt.conf.autoremove:
 +    - remove "linux-image" (and friends) from the auto-remove
 +      blacklist. we have the kernel fallback infrastructure now
 +      in intrepid (thanks to BenC)
 +  * apt-pkg/indexcopy.cc:
 +    - support having CDs with no Packages file (just a Packages.gz)
 +      by not forcing a verification on non-existing files
 +     (LP: #255545)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve the filtering for duplicated apport reports (thanks
 +      to seb128 for pointing that problem out)
 +    - do not report disk full errors from dpkg via apport
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200
 +
 +apt (0.7.14ubuntu5) intrepid; urgency=low
 +
 +  * fix various -Wall warnings
 +  * make "apt-get build-dep" installed packages marked automatic
 +    by default. This can be changed by setting the value of
 +    APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
 +    Haviland, closes: #44874, LP: #248268)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 06 Aug 2008 14:00:51 +0200
 +
 +apt (0.7.14ubuntu4) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix uninitialized variable that caused no apport reports
 +      to be written sometimes (thanks to Matt Zimmerman)
 +  * merge patch that enforces stricter https server certificate
 +    checking (thanks to Arnaud Ebalard, closes: #485960)
 +  * allow per-mirror specific https settings
 +    (thanks to Arnaud Ebalard, closes: #485965)
 +  * add doc/examples/apt-https-method-example.cof
 +    (thanks to Arnaud Ebalard, closes: #485964)
 +  * add DPkg::NoTriggers option so that applications that call
 +    apt/aptitude (like the installer) defer trigger processing
 +    (thanks to Joey Hess) 
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
 +  [ Dereck Wonnacott ]
 +  * apt-ftparchive might write corrupt Release files (LP: #46439)
 +  * Apply --important option to apt-cache depends (LP: #16947) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Aug 2008 10:10:49 +0200
 +
 +apt (0.7.14ubuntu3) intrepid; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
 +    Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
 +  * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve apt progress reporting, display trigger actions
 +  * apt-pkg/depcache.cc:
 +    - when checking for new important deps, skip critical ones
 +      (LP: #236360)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 Jun 2008 17:27:07 +0200
 +
 +apt (0.7.14ubuntu2) intrepid; urgency=low
 +
 +  * debian/control:
 +    - fix FTBFS by adding missing intltool dependency 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 09 May 2008 13:50:22 +0200
 +
  apt (0.7.14) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -5624,285 -4132,23 +5651,285 @@@ apt (0.7.10) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 07 Jan 2008 21:40:47 +0100
  
 -apt (0.7.9) unstable; urgency=low
 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low
  
 -  [ Christian Perrier ]
 -  * Add several languages to LINGUAS and, therefore, really ship the relevant
 -    translation:
 -    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 -    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
 +  * apt-pkg/acquire-item.cc:
 +    - fix signaure removal on transient network failures LP: #220627
 +      (thanks to Scott James Remnant)
  
 -  [ Program translations ]
 -    - Korean updated. Closes: #448430
 -    - Galician updated. Closes: #448497
 -    - Swedish updated.
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 16:32:49 +0200
  
 -  [ Otavio Salvador ]
 -  * Fix configure script to check for CURL library and headers presense.
 -  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 -    to add backward support for arches that lacks pselect support,
 +apt (0.7.9ubuntu16) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - only check against master-keys in net-update to not break
 +      custom CDs (thanks to Colin Watson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 14:17:14 +0200
 +
 +apt (0.7.9ubuntu15) hardy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - do two passes when installing tasks, first ignoring dependencies,
 +      then resolving them and run the problemResolver at the end
 +      so that it can correct any missing dependencies. This should
 +      fix livecd building for kubuntu (thanks to Jonathan Riddell 
 +      for reporting the problem)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Mar 2008 23:25:45 +0100
 +
 +apt (0.7.9ubuntu14) hardy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix incorrect help output for -f (LP: #57487)
 +    - run the problemResolver after a task was installed
 +      so that it can correct any missing dependencies
 +  * typo fixes (LP: #107960)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Mar 2008 21:46:07 +0100
 +
 +apt (0.7.9ubuntu13) hardy; urgency=low
 +
 +  [ Lionel Porcheron ]
 +  * debian/apt.cron.daily:
 +    - only call gconftool if gcontool is installed (LP: #194281)
 +
 +  [ Michael Vogt ]
 +  * doc/apt_preferences.5.xml:
 +    - fix typo (LP: #150900)
 +  * doc/example/sources.list:
 +    - updated for hardy (LP: #195879)
 +  * debian/apt.cron.daily:
 +    - sleep random amount of time (default within 0-30min) before
 +      starting the upate to hit the mirrors less hard
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Mar 2008 15:35:09 +0100
 +
 +apt (0.7.9ubuntu12) hardy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use admin user proxy settings
 +  * cmdline/apt-get.cc:
 +    - fix task installation (thanks to Colin Watson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Feb 2008 15:07:44 +0100
 +
 +apt (0.7.9ubuntu11) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +      (LP: #188127)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Jan 2008 12:06:12 +0100
 +
 +apt (0.7.9ubuntu10) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add "net-update" command that fetches the 
 +      ubuntu-archive-keyring.gpg and add keys from it that are 
 +      signed by the ubuntu-master-keyring.gpg 
 +      (apt-archive-key-signatures spec)
 +  * debian/apt.cron.daily:
 +    - add apt-key net-update to the nightly cron job
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Feb 2008 15:50:28 +0100
 +
 +apt (0.7.9ubuntu9) hardy; urgency=low
 +
 +  * fix FTBFS due to incorrect intltool build-depends
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 16:04:37 +0100
 +
 +apt (0.7.9ubuntu8) hardy; urgency=low
 +
 +  * share/apt-auth-failure.note:
 +    - show update-notifier note if the nightly update fails with a
 +      authentication failure (apt-authentication-reliability spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 14:04:56 +0100
 +
 +apt (0.7.9ubuntu7) hardy; urgency=low
 +
 +  * methods/connect.cc:
 +    - remember hosts with Resolve failures or connect Timeouts
 +      see https://wiki.ubuntu.com/NetworklessInstallationFixes
 +  * cmdlines/apt-key:
 +    - fix bug in the new apt-key update code that imports only
 +      keys signed with the master key (thanks to cjwatson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 08 Feb 2008 11:38:35 +0100
 +
 +apt (0.7.9ubuntu6) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add support for a master-keyring that contains signing keys
 +      that can be used to sign the archive signing keys. This should
 +      make key-rollover easier.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - merged patch from Kees Cook to fix anoying upper-case display
 +      on amd64 in sbuild
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +    - Make the breaks handling use the kill list. This means, that a
 +      Breaks: Pkg (<< version) may put Pkg onto the remove list.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add APT::Apport::MaxReports to limit the maximum number
 +      of reports generated in a single run (default to 3)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add missing "Release" file uri when apt-get update --print-uris
 +      is run
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Feb 2008 14:28:02 +0100
 +
 +apt (0.7.9ubuntu5) hardy; urgency=low
 +
 +  * Merged apt-authentication-reliabilty branch. This means
 +    that apt will refuse to update and use the old lists if
 +    the authentication of a repository that used to be 
 +    authenticated fails. See
 +    https://wiki.ubuntu.com/AptAuthenticationReliability
 +    for more details.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Jan 2008 10:36:10 +0100
 +
 +apt (0.7.9ubuntu4) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc:
 +    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
 +      true, the effect of the compatibility code was to require both of them
 +      to be set to false in order to disable list cleanup; this broke the
 +      installer. Instead, disable list cleanup if either of them is set to
 +      false.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 09 Jan 2008 22:34:37 +0000
 +
 +apt (0.7.9ubuntu3) hardy; urgency=low
 +
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Jan 2008 19:02:11 +0100
 +
 +apt (0.7.9ubuntu2) hardy; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
 +    with newest dpkg-shlibdeps changing the packaging building order and a
 +    patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
 +    closes: #452862.
 +  * Applied patch from Alexander Winston <alexander.winston@comcast.net>
 +    to use 'min' as symbol for minute, closes: #219034.
 +  * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
 +    work properly in initramfs, closes: #448316.
 +  * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
 +    apt-get to ignore time conflicts, closes: #451328.
 +  * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
 +    grammatical error ("manual installed" -> "manually installed"),
 +    closes: #438136.
 +  * Fix cron.daily job to not call fail if apt isn't installed, closes:
 +    #443286.
 +  
 +  [ Daniel Burrows ]
 +  * apt-pkg/contrib/configuration.cc:
 +    - if RootDir is set, then FindFile and FindDir will return paths
 +      relative to the directory stored in RootDir, closes: #456457.
 +
 +  [ Christian Perrier ]
 +  * Fix wording for "After unpacking...". Thans to Michael Gilbert
 +    for the patch. Closes: #260825
 +
 +  [ Program translations ]
 +    - Vietnamese updated. Closes: #453774
 +    - Japanese updated. Closes: #456909
 +    - French updated.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.{cc,h}:
 +    - propergate the Immediate flag to make hitting the 
 +      "E: Internal Error, Could not perform immediate configuration (2)"
 +      harder. (LP: #179247)
 +  * debian/apt.conf.daily:
 +    - print warning if the cache can not be locked (closes: #454561),
 +      thanks to Bastian Kleineidam
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Jan 2008 11:31:45 +0100
 +
 +apt (0.7.9ubuntu1) hardy; urgency=low
 +
 +  * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
 +    changes:
 +    - mirror download method (pending merge with debian)
 +    - no pdiff download by default (unsuitable for ubuntu)
 +    - no recommends-by-default yet
 +    - add "Original-Maintainer" field to tagfile
 +    - show warning on apt-get source if the package is maintained
 +      in a VCS (pedinging merge with debian)
 +    - use ubuntu-archive keyring instead of debians one
 +    - support metapackages section for autoremoval
 +    - debian maintainer field change
 +    - send ubuntu string in user-agent
 +  
 +  * Changes from the debian-sid bzr branch (but not uploaded to debian
 +    yet):
 +  
 +  [ Otavio Salvador ]
 +  * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
 +    apt-mark, closes: #430207.
 +  * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
 +    note about some frontends in apt.8 manpage, closes: #438545.
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
 +    getting crazy when /dev/null is redirected to stdin (which breaks
 +    buildds), closes: #452858.
 +
 +  [ Program translations ]
 +    - Basque updated. Closes: #453088
 +
 +  [ Michael Vogt ]
 +  * debian/rules
 +    - fix https install location
 +  * methods/gpgv.cc:
 +    - remove cruft code that caused timestamp/I-M-S issues
 +  * ftparchive/contents.cc:
 +    - fix error output
 +  * methods/mirror.{cc,h}:
 +    - only update mirror list on IndexFile updates 
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - make the authentication download code more robust against
 +      servers/proxies with broken If-Range implementations
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 +  [ Chris Cheney ]
 +  * ftparchive/contents.cc:
 +    - support lzma data members
 +  * ftparchive/multicompress.cc:
 +    - support lzma output
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Dec 2007 14:46:27 +0100
 +
 +apt (0.7.9) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Add several languages to LINGUAS and, therefore, really ship the relevant
 +    translation:
 +    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 +    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.
@@@ -6011,193 -4257,6 +6038,193 @@@ apt (0.7.7) unstable; urgency=lo
   
   -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
  
 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - give up timeslice on EIO error in read from master terminal
 +  * debian/apt.cron.daily:
 +    - only run the cron job if apt-get check succeeds (LP: #131719)
 +
 +  [ Martin Emrich ]  
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - rewrite dpkgpm.cc to use pselect() instead of select()
 +      to block signals during select() (LP: #134858)
 + 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 20 Oct 2007 07:51:12 +0200
 +
 +apt (0.7.6ubuntu14) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix resource leak (LP: #148806) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Oct 2007 20:57:44 +0200
 +
 +apt (0.7.6ubuntu13) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix crash in WriteApportReport (LP: #144537)
 +  * apt-pkg/acquire-item.cc
 +    - fix disappearing local Packages.gz file (LP: #131166)
 +  * methods/https.cc:
 +    - fix off-by-one error I-M-S handling
 +    - cleanup after I-M-S hit
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Oct 2007 01:48:26 +0200
 +
 +apt (0.7.6ubuntu12) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file
 +      (thanks to Laurent Bigonville, LP: #140019)
 +  * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
 +      in unspecified behaviour;
 +  * Reset curl options and timestamp between downloaded files. Thanks to
 +    Ryan Murray <rmurray@debian.org> for the patch
 +
 +  [Paul Sladen]
 +  * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
 +    to the bit bucket.  Thanks to 'dasdda'.  (LP: #115397)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 03 Oct 2007 02:17:45 +0200
 +
 +apt (0.7.6ubuntu11) gutsy; urgency=low
 +
 +  * apt-pkg/contrib/mmap.cc:
 +    - don't fail if msync() returns > 0 (LP: #144001)
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Sat, 22 Sep 2007 21:39:29 +0100
 +
 +apt (0.7.6ubuntu10) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix parse error when dpkg sends unexpected data
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Sep 2007 17:25:09 +0100
 +
 +apt (0.7.6ubuntu9) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix progress reporting precent calculation (LP: #137798)
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +    (LP: #136767)
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes LP: #125733
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled (LP: #139448)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 +
 +apt (0.7.6ubuntu8) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - fix bug in dpkg log writing when a signal is caught during
 +      select() (LP: #134858)
 +    - write end marker in the log as well
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Sep 2007 15:03:46 +0200
 +
 +apt (0.7.6ubuntu7) gutsy; urgency=low
 +
 +  * reupload to fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Aug 2007 19:44:20 +0200
 +
 +apt (0.7.6ubuntu6) gutsy; urgency=low
 +
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Wed, 15 Aug 2007 20:44:37 +0100
 +
 +apt (0.7.6ubuntu5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - fix file removal on local repo i-m-s hit (LP: #131166)
 +  * tests/local-repo:
 +    - added regression test for this bug
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Aug 2007 12:34:07 +0200
 +
 +apt (0.7.6ubuntu4) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - remove YnPrompt when a XS-Vcs- tag is found, improve the
 +      notice (LP: #129575)
 +  * methods/copy.cc:
 +    - take hashes here too
 +  * apt-pkg/acquire-worker.cc:
 +    - only pass on computed hash if we recived one from the method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Aug 2007 19:30:29 +0200
 +
 +apt (0.7.6ubuntu3) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix packagename extraction when writting apport reports
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size (LP: #125640)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 +
 +apt (0.7.6ubuntu2) gutsy; urgency=low
 +
 +  * doc/examples/sources.list:
 +    - change example source to gutsy
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - do not break if no /dev/pts is available
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 06 Aug 2007 15:17:57 +0200
 +
 +apt (0.7.6ubuntu1) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have a file
 +    - send range request with if-range 
 +    - delete failed downloads
 +    (thanks to Thom May for his help here)
 +    - delete zero size I-M-S hits
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - merged dpkg-log branch, this lets you specify a 
 +      Dir::Log::Terminal file to log dpkg output to
 +    (ABI break)
 +    - when writting apport reports, attach the dpkg
 +      terminal log too
 +  * merged apt--sha256 branch to fully support the new
 +    sha256 checksums in the Packages and Release files
 +    (ABI break)
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size
 +  * tests/local-repo:
 +    - added local repository testcase
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes: #133421
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 +      (thanks to Laurent Bigonville)
 +
 +  [ Ian Jackson ]
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 +
  apt (0.7.6) unstable; urgency=low
  
    * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@@ -6225,14 -4284,6 +6252,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 ]
@@@ -6293,90 -4344,6 +6320,90 @@@ apt (0.7.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sun, 01 Jul 2007 12:31:29 +0200
  
 +apt (0.7.2ubuntu7) gutsy; urgency=low
 +
 +  * fix build-dependencies 
 +  * fixes in the auto-mark code (thanks to Daniel
 +    Burrows)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  9 Jul 2007 19:02:54 +0200
 +
 +apt (0.7.2ubuntu6) gutsy; urgency=low
 +
 +  [ Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - make the XS-Vcs-$foo warning more copy'n'paste
 +      friendly (thanks to Matt Zimmerman)
 +    - ignore the Vcs-Browser tag (Fixes LP: #121770)
 +  * debian/apt.conf.autoremove:
 +    - added "linux-ubuntu-modules" to APT::NeverAutoRemove
 +
 +  [ Sarah Hobbs ]
 +  * Change metapackages to *metapackages in Install-Recommends-Section
 +    and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
 +    the Recommends of metapackages in universe and multiverse will get
 +    installed.
 +  * Also make this change in doc/examples/configure-index.
 +  * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
 +    docbook to fix FTBFS.
 +  * Added in previous changelog entries, as those who uploaded did not
 +    actually commit to Bzr.
 +
 + -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 09 Jul 2007 01:15:57 +1000
 +
 +apt (0.7.2ubuntu5) gutsy; urgency=low
 +
 +  * Rerun autoconf to fix the FTBFS.
 +
 + -- Michael Bienia <geser@ubuntu.com>  Fri, 06 Jul 2007 19:17:33 +0200
 +
 +apt (0.7.2ubuntu4) gutsy; urgency=low
 +
 +  * Rebuild for the libcurl4 -> libcurl3 transition mess.
 +
 + -- Steve Kowalik <stevenk@ubuntu.com>  Fri,  6 Jul 2007 12:44:05 +1000
 +
 +apt (0.7.2ubuntu3) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix InstallTask code when a pkgRecord ends 
 +      with a single '\n' (thanks to Soren Hansen for reporting)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jun 2007 13:33:38 +0200
 +
 +apt (0.7.2ubuntu2) gutsy; urgency=low
 +
 +  * fixed compile errors with g++ 4.3 (thanks to 
 +    Daniel Burrows, closes: #429378)
 +  * fix FTFBFS by changing build-depends to
 +    libcurl4-gnutls-dev (closes: #428363)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Jun 2007 13:47:03 +0200
 +
 +apt (0.7.2ubuntu1) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - apport integration added, this means that a apport
 +      report is written on dpkg failures
 +  * cmdline/apt-get.cc:
 +    - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
 +      this will warn when Vcs- headers are found on apt-get source
 +      (Fixes LP:#115959)
 +  * merged from debian/unstable, remaining changes:
 +    - maintainer field changed
 +    - merged the apt--mirror branch 
 +      http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
 +    - apport reporting on package install/upgrade/remove failure
 +    - support for "Originial-Maintainer" field
 +    - merged apt--xs-vcs-bzr branch
 +      (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
 +    - use ubuntu archive keyring by default
 +    - debian/apt.conf.autoremove
 +      + install recommands for section "metapackages"
 +      + do not mark direct dependencies of "metapackages" as autoremoved
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 10:38:36 +0200
 +
  apt (0.7.2-0.1) unstable; urgency=low
  
    * Non-maintainer upload.
@@@ -6470,144 -4437,34 +6497,144 @@@ apt (0.7.1) experimental; urgency=lo
    * apt-pkg/policy.cc:
      - allow multiple packages (thanks to David Foerster)
  
 - -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 + -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 +
 +apt (0.7.0) experimental; urgency=low
 +
 +  * Package that contains all the new features
 +  * Removed all #pragma interface/implementation
 +  * Branch that contains all the new features:
 +  * translated package descriptions
 +  * task install support
 +  * automatic dependency removal (thanks to Daniel Burrows)
 +  * merged support for the new dpkg "Breaks" field 
 +    (thanks to Ian Jackson)
 +  * handle network failures more gracefully on "update"
 +  * support for unattended-upgrades (via unattended-upgrades
 +    package)
 +  * added apt-transport-https method
 +  * merged "install-recommends" branch (ABI break): 
 +    - new "--install-recommends"
 +    - install new recommends on "upgrade" if --install-recommends is 
 +      given
 +    - new "--fix-policy" option to install all packages with unmet
 +      important dependencies (usefull with --install-recommends to
 +      see what not-installed recommends are on the system)
 +    - fix of recommended packages display (only show CandidateVersion
 +      fix or-group handling)
 +  * merged "install-task" branch (use with "apt-get install taskname^")
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 +
 +apt (0.6.46.4ubuntu10) feisty; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - added "APT::Never-MarkAuto-Section" and consider dependencies 
 +      of packages in this section manual (LP#59893)
 +    - ensure proper permissions in the extended_state file (LP#67037)
 +  * debian/apt.conf.ubuntu:
 +    - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
 +  * cmdline/apt-get.cc:
 +    - "apt-get install foo" on a already installed package foo will
 +      clean the automatic installed flag (LP#72007)
 +    - do not show packages already marked for removal as auto-installed
 +      (LP#64493)
 +    - applied patch to (optionally) hide the auto-remove information
 +      (thanks to Frode M. Døving) (LP#69148)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100
 +
 +apt (0.6.46.4ubuntu9) feisty; urgency=low
 +
 +  * debian/control:
 +    - set XS-Vcs-Bzr header
 +    - Set Ubuntu maintainer address
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +    - only umount if it was mounted by the method before
 +  * cmdline/apt-get.cc:
 +    - fix version output in autoremove list (LP#68941)
 +  * apt-pkg/packagemanager.cc:
 +    - do not spin 100% cpu in FixMissing() (LP#84476)
 +  * apt-pkg/indexfile.cc:
 +    - fix problem overwriting APT::Acquire::Translation
 +  * doc/examples/configure-index:
 +    - document APT::Acquire::Translation
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 15:24:39 +0100
 +
 +apt (0.6.46.4ubuntu8) feisty; urgency=low
 +
 +  * fix segfault in the pkgRecords destructor
 +  * Bump ABI version
 +  * debian/control:
 +    - make the libcurl3-gnutls-dev versionized (LP#86614)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:26:33 +0100
 +
 +apt (0.6.46.4ubuntu7) feisty; urgency=low
 +
 +  * Merged the apt--mirror branch. This means that a new 'mirror' 
 +    method is available that will allow dynamic mirror updates.
 +    The sources.list entry looks something like this:
 +    "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
 +
 +    It also supports error reporting to a configurable url for mirror
 +    problems/failures.
 +  * Bump ABI version
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:38:06 +0100
 +
 +apt (0.6.46.4ubuntu6) feisty; urgency=low
 +
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/algorithms.cc:
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +    - fix segfault (lp: #76530)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
 +
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
 +
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
  
 -apt (0.7.0) experimental; urgency=low
 +apt (0.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
  
 -  * Package that contains all the new features
 -  * Removed all #pragma interface/implementation
 -  * Branch that contains all the new features:
 -  * translated package descriptions
 -  * task install support
 -  * automatic dependency removal (thanks to Daniel Burrows)
 -  * merged support for the new dpkg "Breaks" field 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 +
 +apt (0.6.46.4ubuntu3) feisty; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - use clog for all debugging
 +  * apt-pkg/depcache.cc:
 +    - never mark Required package for autoremoval (lp: #75882)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
 +
 +apt (0.6.46.4ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
      (thanks to Ian Jackson)
 -  * handle network failures more gracefully on "update"
 -  * support for unattended-upgrades (via unattended-upgrades
 -    package)
 -  * added apt-transport-https method
 -  * merged "install-recommends" branch (ABI break): 
 -    - new "--install-recommends"
 -    - install new recommends on "upgrade" if --install-recommends is 
 -      given
 -    - new "--fix-policy" option to install all packages with unmet
 -      important dependencies (usefull with --install-recommends to
 -      see what not-installed recommends are on the system)
 -    - fix of recommended packages display (only show CandidateVersion
 -      fix or-group handling)
 -  * merged "install-task" branch (use with "apt-get install taskname^")
  
 - -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 23:07:24 +0100
 +
 +apt (0.6.46.4ubuntu1) feisty; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
  
  apt (0.6.46.4-0.1) unstable; urgency=emergency
    
@@@ -6638,26 -4495,6 +6665,26 @@@ apt (0.6.46.4) unstable; urgency=hig
  
   -- Michael Vogt <mvo@debian.org>  Thu,  7 Dec 2006 10:49:50 +0100
  
 +apt (0.6.46.3ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Thu,  7 Dec 2006 15:46:52 +0000
 +
 +apt (0.6.46.3ubuntu1) feisty; urgency=low
 +
 +  * doc/apt-get.8.xml:
 +    - documented autoremove, thanks to Vladimír Lapá\e%GÄ\8d\e%@ek 
 +      (lp: #62919)
 +  * fix broken i18n in the dpkg progress reporting, thanks to 
 +    Frans Pop and Steinar Gunderson. (closes: #389261)
 +  * po/en_GB.po:
 +    - typo (lp: #61270)
 +  * add apt-secure.8 to "See also" section
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 23 Nov 2006 07:24:12 +0100
 +
  apt (0.6.46.3-0.2) unstable; urgency=high
  
    * Non-maintainer upload with permission of Michael Vogt.
@@@ -6770,173 -4607,6 +6797,173 @@@ apt (0.6.46) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Thu, 21 Sep 2006 10:25:03 +0200
  
 +apt (0.6.45ubuntu14) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the TryInstallTask() code to make sure that all package
 +      there are marked manual install (lp: #61684)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Sep 2006 00:34:20 +0200
 +
 +apt (0.6.45ubuntu13) edgy; urgency=low
 +
 +  * no-changes upload to make apt rebuild against latest g++ and
 +    fix synaptic FTBFS (see bug: #62461 for details)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Sep 2006 22:33:10 +0200
 +
 +apt (0.6.45ubuntu12) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix in the sweep() code, set garbage flag for packages scheduled 
 +      for removal too
 +    - do not change the autoFlag in MarkKeep(), this can lead to suprising
 +      side effects
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Sep 2006 00:58:24 +0200
 +
 +apt (0.6.45ubuntu11) edgy; urgency=low
 +
 +  * removed "installtask" and change it so that tasknames can be given
 +    with "apt-get install taskname^"
 +  * improve the writeStateFile() code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Sep 2006 14:14:24 +0200
 +
 +apt (0.6.45ubuntu10) edgy; urgency=low
 +
 +  * methods/http.cc:
 +    - check more careful for incorrect proxy settings (closes: #378868)
 +  * methods/gzip.cc:
 +    - don't hang when /var is full (closes: #341537), thanks to
 +      Luis Rodrigo Gallardo Cruz for the patch
 +  * doc/examples/sources.list:
 +    - removed non-us.debian.org from the example (closes: #380030,#316196)
 +  * Merged from Christian Perrier bzr branch:
 +    * ro.po: Updated to 514t. Closes: #388402
 +    * dz.po: Updated to 514t. Closes: #388184
 +    * it.po: Fixed typos. Closes: #387812
 +    * ku.po: New kurdish translation. Closes: #387766
 +    * sk.po: Updated to 514t. Closes: #386851
 +    * ja.po: Updated to 514t. Closes: #386537
 +    * gl.po: Updated to 514t. Closes: #386397
 +    * fr.po: Updated to 516t.
 +    * fi.po: Updated to 512t. Closes: #382702
 +  * share/archive-archive.gpg:
 +    - removed the outdated amd64 and debian-2004 keys
 +  * apt-pkg/tagfile.cc:
 +    - applied patch from Jeroen van Wolffelaar to make the tags
 +      caseinsensitive (closes: #384182)
 +    - reverted MMap use in the tagfile because it does not work 
 +      across pipes (closes: #383487) 
 +  * added "installtask" command
 +  * added new ubuntu specific rewrite rule for "Original-Maintainer"
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Sep 2006 15:07:51 +0200
 +
 +apt (0.6.45ubuntu9) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - if --no-remove is given, do not run the AutoRemove code 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Sep 2006 11:54:20 +0200
 +
 +apt (0.6.45ubuntu8) edgy; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
 +      information (lp: #59457)
 +  * cmdline/apt-get.cc:
 +    - fix typo in autoremove information (lp: #59420)
 +  * install apt-mark to modify the automatically install information for
 +    packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 20:07:22 +0200
 +
 +apt (0.6.45ubuntu7) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix a bug in the install-recommends-section code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 18:22:38 +0200
 +
 +apt (0.6.45ubuntu6) edgy; urgency=low
 +
 +  [Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - always show auto-removable packages and give a hint how to remove 
 +      them
 +  * debian/apt.conf.ubuntu:
 +    - exlucde linux-image and linux-restricted-modules from ever being 
 +      auto-removed
 +    - added "metapackages" as the section we want to install recommends
 +      by default
 +  * apt-pkg/depcache.cc:
 +    - added support to turn install-recommends selectively on/off by
 +      section
 +  [Ian Jackson]
 +  * Tests pass without code changes!  Except that we need this:
 +  * Bump cache file major version to force rebuild so that Breaks
 +    dependencies are included.
 +  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
 +    --auto-deconfigure is very very old and dpkg-dev's Breaks support
 +    is more or less orthogonal.
 +  * Initial draft of `Breaks' implementation.  Appears to compile,
 +    but as yet *completely untested*.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 11:50:52 +0200
 +
 +apt (0.6.45ubuntu5) edgy; urgency=low
 +
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase the APT::Cache-Limit to deal with the increased demand due
 +      to the translated descriptions
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - pass "--auto-deconfigure" to dpkg on install to support the
 +      new "breaks" in dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 +
 +apt (0.6.45ubuntu4) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the new --fix-polciy code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 21:08:11 +0200
 +
 +apt (0.6.45ubuntu3) edgy; urgency=low
 +
 +  * ABI break
 +  * merged latest apt--install-recommends (closes: #559000)
 +  * added "--fix-policy" option to can be used as "--fix-broken" and
 +    will install missing weak depends (recommends, and/or suggests 
 +    depending on the settings)
 +  * merged the apt--ddtp branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Aug 2006 12:53:23 +0200
 +
 +apt (0.6.45ubuntu2) edgy; urgency=low
 +
 +  * debian/control:
 +    - switched to libdb4.4 for building (closes: #381019)
 +  * cmdline/apt-get.cc:
 +    - show only the recommends/suggests for the candidate-version, not for all
 +      versions of the package (closes: #257054)
 +    - properly handle recommends/suggests or-groups when printing the list of
 +      suggested/recommends packages (closes: #311619)
 +  * merged "apt--install-recommends" branch:
 +    - added "{no-}install-recommends" commandline option
 +    - added APT::Install-{Recommends,Suggests} option
 +    - currently Install-Recommends defaults to "False" 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 23:38:46 +0200
 +
 +apt (0.6.45ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  1 Aug 2006 15:43:22 +0200
 +
  apt (0.6.45) unstable; urgency=low
  
    * apt-pkg/contrib/sha256.cc:
@@@ -6982,37 -4652,6 +7009,37 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
  
 +apt (0.6.44.2ubuntu4) edgy; urgency=low
 +
 +  * Make apt-get dselect-upgrade happy again
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Jul 2006 11:03:02 +0200
 +
 +apt (0.6.44.2ubuntu3) edgy; urgency=low
 +
 +  * Close extended_states file after writing it.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Tue, 18 Jul 2006 00:12:13 +0100
 +
 +apt (0.6.44.2ubuntu2) edgy; urgency=low
 +
 +  * create a empty extended_states file if none exists already
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 09:23:03 +0200
 +
 +apt (0.6.44.2ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +  * merged the "auto-mark" branch to support aptitude like
 +    marking of automatically installed dependencies and added
 +    "apt-get remove --auto-remove" to remove unused auto-installed
 +    packages again
 +  * changed library version from 3.11 to 3.50 to make it clearly 
 +    different from the debian version (we are ABI incompatible because
 +    of the auto-mark patch)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 +
  apt (0.6.44.2exp1) experimental; urgency=low
  
    * added support for i18n of the package descriptions
@@@ -7101,26 -4740,6 +7128,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:
@@@ -7153,38 -4772,6 +7180,38 @@@
  
   -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
  
 +apt (0.6.43.2ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
 +  * ca.po: Completed to 512t. Closes: #351592
 +    * eu.po: Completed to 512t. Closes: #350483
 +    * ja.po: Completed to 512t. Closes: #349806
 +    * pl.po: Completed to 512t. Closes: #349514
 +    * sk.po: Completed to 512t. Closes: #349474
 +    * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
 +    * sv.po: Completed to 512 strings Closes: #349210
 +    * ru.po: Completed to 512 strings Closes: #349154
 +    * da.po: Completed to 512 strings Closes: #349084
 +    * fr.po: Completed to 512 strings
 +    * LINGUAS: Add Welsh
 +    * *.po: Updated from sources (512 strings)
 +    * vi.po: Completed to 511 strings  Closes: #348968
 +  * apt-pkg/deb/deblistparser.cc:
 +    - don't explode on a DepCompareOp in a Provides line, but warn about
 +      it and ignore it otherwise (thanks to James Troup for reporting it)
 +  * cmdline/apt-get.cc:
 +    - don't lock the lists directory in DoInstall, breaks --print-uri 
 +      (thanks to James Troup for reporting it)
 +  * debian/apt.dirs: create /etc/apt/sources.list.d 
 +  * make apt-cache madison work without deb-src entries (#352583)
 +  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
 +    successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
 +
  apt (0.6.43.2) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@@ -7208,24 -4795,6 +7235,24 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
 +apt (0.6.43.1ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
 +    - en_GB.po, de.po: fix spaces errors in "Ign " translations
 +      Closes: #347258
 +    - makefile: make update-po a pre-requisite of clean target so
 +              that POT and PO files are always up-to-date
 +    - sv.po: Completed to 511t. Closes: #346450
 +    - sk.po: Completed to 511t. Closes: #346369
 +    - fr.po: Completed to 511t
 +    - *.po: Updated from sources (511 strings)
 +  * add patch to fix http download corruption problem (thanks to
 +    Petr Vandrovec, closes: #280844, #290694)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
 +
  apt (0.6.43.1) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@@ -7249,19 -4818,6 +7276,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:  
@@@ -7282,22 -4838,6 +7309,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:
@@@ -7404,80 -4944,6 +7431,80 @@@ apt (0.6.41) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Mon,  5 Sep 2005 22:59:03 +0200
  
 +apt (0.6.40.1ubuntu8) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
 +    - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
 +  * po/de.po, po/fr.po: 
 +    - updated the translations
 +  * po/makefile:
 +    - create a single pot file in each domain dir to make rosetta happy
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 +
 +apt (0.6.40.1ubuntu7) breezy; urgency=low
 +
 +  * updated the pot/po files , no code changes
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Sep 2005 18:38:16 +0200
 +
 +apt (0.6.40.1ubuntu6) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
 +    - make it possible for apt to handle a failed MediaChange event and
 +      fall back to other sources (ubuntu #13713)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2005 22:09:50 +0200
 +
 +apt (0.6.40.1ubuntu5) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
 +    This adds media-change reporting to the apt status-fd (ubuntu #15213)
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
 +    apt-pkg/cdrom.cc:
 +    - unmount the cdrom when apt failed to locate any package files
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 15:44:26 +0200
 +
 +apt (0.6.40.1ubuntu4) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - fix a embarrassing typo
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 10:10:37 +0200
 +
 +apt (0.6.40.1ubuntu3) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use the ctime as well when figuring what packages need to
 +      be removed. This fixes the problem that packages copied with    
 +      "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Sep 2005 18:30:46 +0200
 +
 +apt (0.6.40.1ubuntu2) breezy; urgency=low
 +
 +  * improved the support for "error" and "conffile" reporting from
 +    dpkg, added the format to README.progress-reporting
 +  * added README.progress-reporting to the apt-doc package
 +  * Do md5sum checking for file and cdrom method (closes: #319142)
 +  * Change pkgPolicy::Pin from private to protected to let subclasses
 +    access it too (closes: #321799)
 +  * methods/connect.cc:
 +    - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
 +  * apt-pkg/acquire-item.cc:
 +    - fail early if a FailReason is TmpResolveFailure (avoids hangs during
 +      the install when no network is available)
 +  * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 19:44:55 +0200
 +
 +apt (0.6.40.1ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 14:20:56 +0200
 +
  apt (0.6.40.1) unstable; urgency=low
  
    * bugfix in the parsing code for the apt<->dpkg communication. apt 
@@@ -7487,12 -4953,6 +7514,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
@@@ -7508,39 -4968,6 +7535,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
@@@ -7553,13 -4980,6 +7580,13 @@@
  
   -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -0700
  
 +apt (0.6.38ubuntu1) breezy; urgency=low
 +
 +  * First release from Ubuntu branch
 +  * Merge with --main--0, switch back to Ubuntu keyring
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 25 Jun 2005 16:52:41 -0700
 +
  apt (0.6.38) unstable; urgency=low
  
    * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround

diff --combined debian/control
index b793d3f04b804472d847937190ecb283ff00b710,762d2818eb622c3c41c0b51c971706046ac3660a..8834079a2d188d5ada6b8548bea13a2bb6f76576
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,24 -1,23 +1,24 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
  Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Julian Andres Klode <jak@debian.org>
  Standards-Version: 3.9.3
  Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
 - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
 + gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
   zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
   po4a (>= 0.34-2), autotools-dev, autoconf, automake
  Build-Depends-Indep: doxygen, debiandoc-sgml
  Build-Conflicts: autoconf2.13, automake1.4
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
 +Vcs-Browser: http://code.launchpad.net/apt/ubuntu
  
  Package: apt
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
 +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
  Replaces: manpages-pl (<< 20060617-3~)
  Conflicts: python-apt (<< 0.7.93.2~)
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
@@@ -42,6 -41,7 +42,7 @@@ Architecture: an
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends}
+ Breaks: apt (<< 0.9.4~)
  Section: libs
  Description: package managment runtime library
   This library provides the common functionality for searching and

diff --combined doc/po/apt-doc.pot
index 7ade0fe8dfd73aba7eafd6d5a9c9e9150cba4e60,6335e29b4d19434dcabb3c5b5bbb80af60f3f512..e4f3f34586a3887b7ebed3fe687bcf44d719cb87
--- 1/doc/po/apt-doc.pot
--- 2/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: apt-doc 0.9.7.5ubuntu1\n"
+ "Project-Id-Version: apt-doc 0.9.7.4\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-09-04 14:07+0300\n"
+ "POT-Creation-Date: 2012-08-30 22:07+0300\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -1620,8 -1620,8 +1620,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -1670,22 -1670,22 +1670,22 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -4012,7 -4012,7 +4012,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
+ msgid "P &gt;= 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
@@@ -4024,7 -4024,7 +4024,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
@@@ -4036,7 -4036,7 +4036,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
@@@ -4048,7 -4048,7 +4048,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
@@@ -4060,7 -4060,7 +4060,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

diff --combined doc/po/de.po
index 1c4c2156553fed2140dfc1351bb16cc835294967,373cf8eb5759bb1afb805ffc34fcd7adc6947368..994b46a305dfaa25f0bf75c5c9c2c182f4b0b98e
--- 1/doc/po/de.po
--- 2/doc/po/de.po
+++ b/doc/po/de.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.9.7\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-09 22:05+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2012-06-25 22:49+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@@ -920,11 -920,10 +920,10 @@@ msgid "
  "versions or none at all."
  msgstr ""
  "Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</"
- "literal>-Zeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, "
- "dass Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche "
- "Zeile hinzufügen müssen; andernfalls werden Sie eventuell entweder die "
- "falschen Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete "
- "erhalten."
+ "literal>-Zeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, dass "
+ "Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche Zeile "
+ "hinzufügen müssen; andernfalls werden Sie eventuell entweder die falschen "
+ "Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete erhalten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:178
@@@ -966,7 -965,8 +965,8 @@@ msgid "
  msgstr ""
  "Beachten Sie, dass Quellpakete nicht wie normale Programmpakete in der "
  "Datenbank von <command>dpkg</command> installiert und nachverfolgt werden; "
- "sie werden nur wie Quell-Tarballs in das aktuelle Verzeichnis heruntergeladen."
+ "sie werden nur wie Quell-Tarballs in das aktuelle Verzeichnis "
+ "heruntergeladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:197
@@@ -1966,11 -1966,11 +1966,11 @@@ msgid "
  "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf "
  "packages), blue lines are pre-depends, green lines are conflicts."
  msgstr ""
- "Die resultierenden Knoten haben mehrere Formen: Normale Pakete sind Kästchen, "
- "rein virtuelle Pakete sind Dreiecke, gemischt virtuelle Pakete sind "
- "Diamanten, fehlende Pakete sind Sechsecke. Orange Kästchen bedeuten, dass die "
- "Rekursion beendet wurde [Leaf Packages], blaue Linien sind Pre-depends, grüne "
- "Linien sind Konflikte."
+ "Die resultierenden Knoten haben mehrere Formen: Normale Pakete sind "
+ "Kästchen, rein virtuelle Pakete sind Dreiecke, gemischt virtuelle Pakete "
+ "sind Diamanten, fehlende Pakete sind Sechsecke. Orange Kästchen bedeuten, "
+ "dass die Rekursion beendet wurde [Leaf Packages], blaue Linien sind Pre-"
+ "depends, grüne Linien sind Konflikte."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:221
@@@ -2261,19 -2261,12 +2261,19 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:130
 +#, fuzzy
 +#| msgid ""
 +#| "Update the local keyring with the archive keyring and remove from the "
 +#| "local keyring the archive keys which are no longer valid.  The archive "
 +#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
 +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
 +#| "package in Debian."
  msgid ""
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
  "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
@@@ -2342,33 -2335,24 +2342,33 @@@ msgstr "lokale Datenbank vertrauenswür
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
  
@@@ -2627,8 -2611,8 +2627,8 @@@ msgstr "
  "berechnet und in der Release-Datei abgelegt. Dann wird die Release-Datei "
  "durch den Archivschlüssel für diese Debian-Veröffentlichung signiert und "
  "zusammen mit den Paketen und Packages-Dateien auf Debian-Spiegel verteilt. "
- "Die Schlüssel sind im Debian-Archivschlüsselbund im Paket "
- "<package>debian-archive-keyring</package> verfügbar."
+ "Die Schlüssel sind im Debian-Archivschlüsselbund im Paket <package>debian-"
+ "archive-keyring</package> verfügbar."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-secure.8.xml:113
@@@ -2637,10 -2621,10 +2637,10 @@@ msgid "
  "a package from it and compare it with the checksum of the package they "
  "downloaded by hand - or rely on APT doing this automatically."
  msgstr ""
- "Endanwender können die Signatur der Release-Datei prüfen, die Prüfsumme eines "
- "Paketes daraus entpacken und mit der Prüfsumme des Pakets vergleichen, das "
- "sie manuell heruntergeladen haben – oder sich darauf verlassen, dass APT dies "
- "automatisch tut."
+ "Endanwender können die Signatur der Release-Datei prüfen, die Prüfsumme "
+ "eines Paketes daraus entpacken und mit der Prüfsumme des Pakets vergleichen, "
+ "das sie manuell heruntergeladen haben – oder sich darauf verlassen, dass APT "
+ "dies automatisch tut."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-secure.8.xml:118
@@@ -3008,8 -2992,8 +3008,8 @@@ msgstr "
  "»shell« wird benutzt, um aus einem Shellskript auf "
  "Konfigurationsinformationen zuzugreifen. Es wird ein Paar von Argumenten "
  "angegeben – das erste als Shell-Variable und das zweite als "
- "Konfigurationswert zum Abfragen. Als Ausgabe führt es "
- "Shell-Zuweisungsbefehle für jeden vorhandenen Wert auf. In einen Shellskript "
+ "Konfigurationswert zum Abfragen. Als Ausgabe führt es Shell-"
+ "Zuweisungsbefehle für jeden vorhandenen Wert auf. In einen Shellskript "
  "sollte es wie folgt benutzt werden:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
@@@ -3077,11 -3061,11 +3077,11 @@@ msgstr "
  "definiert die Ausgabe jeder Konfigurationsoption. &percnt;t wird durch den "
  "individuellen Namen ersetzt, &percnt;f durch ihren vollständigen "
  "hierarchichen Namen und &percnt;v durch ihren Wert. Verwenden Sie "
- "Großbuchstaben; Sonderzeichen in dem Wert werden kodiert, um sicherzustellen, "
- "dass sie z.B. in einer maskierten Zeichenkette, wie sie RFC822 definiert, "
- "sicher verwandt werden kann. &percnt;n wird zusätzlich durch einen "
- "Zeilenumbruch ersetzt, &percnt;N durch einen Tabulator. Ein &percnt; kann "
- "mittels &percnt;&percnt; ausgegeben werden."
+ "Großbuchstaben; Sonderzeichen in dem Wert werden kodiert, um "
+ "sicherzustellen, dass sie z.B. in einer maskierten Zeichenkette, wie sie "
+ "RFC822 definiert, sicher verwandt werden kann. &percnt;n wird zusätzlich "
+ "durch einen Zeilenumbruch ersetzt, &percnt;N durch einen Tabulator. Ein "
+ "&percnt; kann mittels &percnt;&percnt; ausgegeben werden."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64
@@@ -3227,8 -3211,8 +3227,8 @@@ msgstr "
  "wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, "
  "wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-"
  "Yes \"true\";</literal>. Die Anführungszeichen und abschließenden "
- "Strichpunkte werden benötigt. Der Wert muss in einer Zeile stehen und "
- "es gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Werte dürfen "
+ "Strichpunkte werden benötigt. Der Wert muss in einer Zeile stehen und es "
+ "gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Werte dürfen "
  "keine Rückwärtsschrägstriche oder zusätzliche Anführungszeichen enthalten. "
  "Optionsnamen werden aus alphanumerischen Zeichen und den Zeichen »/-:._+« "
  "gebildet. Ein neuer Geltungsbereich kann mit geschweiften Klammern geöffnet "
@@@ -3322,11 -3306,10 +3322,10 @@@ msgstr "
  "missbilligt ist und von alternativen Implementierungen nicht unterstützt "
  "wird) und <literal>#clear</literal>: <literal>#include</literal> wird die "
  "angegebene Datei einfügen, außer, wenn der Dateiname mit einem Schrägstrich "
- "endet, in diesem Fall wird das ganze Verzeichnis eingefügt. "
- "<literal>#clear</literal> wird benutzt, um einen Teil des Konfigurationsbaums "
- "zu löschen. Das angegebene Element und alle davon absteigenden Elemente "
- "werden gelöscht. (Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich "
- "enden müssen.)"
+ "endet, in diesem Fall wird das ganze Verzeichnis eingefügt. <literal>#clear</"
+ "literal> wird benutzt, um einen Teil des Konfigurationsbaums zu löschen. Das "
+ "angegebene Element und alle davon absteigenden Elemente werden gelöscht. "
+ "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt.conf.5.xml:123
@@@ -3340,10 -3323,10 +3339,10 @@@ msgstr "
  "Der <literal>#clear</literal>-Befehl ist der einzige Weg, eine Liste oder "
  "einen kompletten Geltungsbereich zu löschen. Erneutes Öffnen eines "
  "Geltungsbereichs (oder die unten beschriebene Syntax mit angehängten "
- "<literal>::</literal>) wird vorherige Einträge <emphasis>nicht</"
- "emphasis> außer Kraft setzen. Optionen können nur außer Kraft gesetzt werden, "
- "indem ein neuer Wert an sie adressiert wird – Listen und Geltungsbereiche "
- "können nicht außer Kraft gesetzt, sondern nur bereinigt werden."
+ "<literal>::</literal>) wird vorherige Einträge <emphasis>nicht</emphasis> "
+ "außer Kraft setzen. Optionen können nur außer Kraft gesetzt werden, indem "
+ "ein neuer Wert an sie adressiert wird – Listen und Geltungsbereiche können "
+ "nicht außer Kraft gesetzt, sondern nur bereinigt werden."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt.conf.5.xml:131
@@@ -3382,19 -3365,20 +3381,20 @@@ msgid "
  "explicitly complain about them."
  msgstr ""
  "Beachten Sie, dass das Anhängen von Elementen an eine Liste mittels "
- "<literal>::</literal> nur für ein Element pro Zeile funktioniert, Sie sollten "
- "es nicht nicht in Verbindung mit einer Geltungsbereichssyntax benutzen (die "
- "»<literal>::</literal>« explizit hinzufügt). Die Benutzung der Syntax von "
- "beiden zusammen wird einen Fehler auslösen, auf den sich einige Anwender "
- "ungünstigerweise verlassen: eine Option mit dem unüblichen Namen "
+ "<literal>::</literal> nur für ein Element pro Zeile funktioniert, Sie "
+ "sollten es nicht nicht in Verbindung mit einer Geltungsbereichssyntax "
+ "benutzen (die »<literal>::</literal>« explizit hinzufügt). Die Benutzung der "
+ "Syntax von beiden zusammen wird einen Fehler auslösen, auf den sich einige "
+ "Anwender ungünstigerweise verlassen: eine Option mit dem unüblichen Namen "
  "»<literal>::</literal>«, die sich wie jede andere Option mit einem Namen "
  "verhält. Dies leitet viele Probleme ein; zum einen werden Anwender, die "
- "mehrere Zeilen in dieser <emphasis>falschen</emphasis> Syntax in der Hoffnung "
- "etwas an die Liste anzuhängen, schreiben, das Gegenteil erreichen, da nur die "
- "letzte Zuweisung zu dieser Option »<literal>::</literal>« benutzt wird. "
- "Zukünftige APT-Versionen werden Fehler ausgeben und die Arbeit stoppen, wenn "
- "sie auf diese falsche Verwendung stoßen. Korrigieren Sie deshalb nun solche "
- "Anweisungen, solange sich APT nicht explizit darüber beklagt."
+ "mehrere Zeilen in dieser <emphasis>falschen</emphasis> Syntax in der "
+ "Hoffnung etwas an die Liste anzuhängen, schreiben, das Gegenteil erreichen, "
+ "da nur die letzte Zuweisung zu dieser Option »<literal>::</literal>« benutzt "
+ "wird. Zukünftige APT-Versionen werden Fehler ausgeben und die Arbeit "
+ "stoppen, wenn sie auf diese falsche Verwendung stoßen. Korrigieren Sie "
+ "deshalb nun solche Anweisungen, solange sich APT nicht explizit darüber "
+ "beklagt."
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt.conf.5.xml:154
@@@ -3440,8 -3424,8 +3440,8 @@@ msgstr "
  "wurden. Diese Liste wird benutzt, wenn Dateien abgerufen und Paketlisten "
  "ausgewertet werden. Die interne Vorgabe ist immer die native Architektur des "
  "Systems (<literal>APT::Architecture</literal>) und fremde Architekturen "
- "werden der vorgegebenen Liste hinzugefügt, wenn sie per <command>dpkg "
- "--print-architectures</command> registriert werden."
+ "werden der vorgegebenen Liste hinzugefügt, wenn sie per <command>dpkg --"
+ "print-architectures</command> registriert werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:180
@@@ -3495,17 -3479,17 +3495,17 @@@ msgid "
  "longer guaranteed to work, as its dependency on A is no longer satisfied."
  msgstr ""
  "ist standardmäßig aktiviert, was APT veranlassen wird, essentielle und "
- "wichtige Pakete so bald wie möglich in einer "
- "Installations-/Aktualisierungstransaktion zu installieren, um die "
- "Auswirkungen eines scheiternden &dpkg;-Aufrufs zu begrenzen. Falls diese "
- "Option deaktiviert ist, betrachtet APT ein wichtiges Paket auf die gleiche "
- "Weise wie ein zusätzliches Paket: Zwischen dem Entpacken des Pakets A und "
- "seiner Konfiguration können viele andere Entpack- oder Konfigurationsaufrufe "
- "für andere, nicht zugehörige Pakete B, C etc. liegen. Falls dies zum "
- "Scheitern des &dpkg;-Aufrufs führt (z.B. weil Betreuerskripte des Pakets B "
- "einen Fehler erzeugen), führt dies zu einem Systemstatus, in dem Paket A "
- "entpackt, aber nicht konfiguriert ist, daher ist nicht länger gewährleistet, "
- "dass irgendein Paket, das von A abhängt, weiter funktioniert, da seine "
+ "wichtige Pakete so bald wie möglich in einer Installations-/"
+ "Aktualisierungstransaktion zu installieren, um die Auswirkungen eines "
+ "scheiternden &dpkg;-Aufrufs zu begrenzen. Falls diese Option deaktiviert "
+ "ist, betrachtet APT ein wichtiges Paket auf die gleiche Weise wie ein "
+ "zusätzliches Paket: Zwischen dem Entpacken des Pakets A und seiner "
+ "Konfiguration können viele andere Entpack- oder Konfigurationsaufrufe für "
+ "andere, nicht zugehörige Pakete B, C etc. liegen. Falls dies zum Scheitern "
+ "des &dpkg;-Aufrufs führt (z.B. weil Betreuerskripte des Pakets B einen "
+ "Fehler erzeugen), führt dies zu einem Systemstatus, in dem Paket A entpackt, "
+ "aber nicht konfiguriert ist, daher ist nicht länger gewährleistet, dass "
+ "irgendein Paket, das von A abhängt, weiter funktioniert, da seine "
  "Abhängigkeit von A nicht länger erfüllt wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -3553,8 -3537,8 +3553,8 @@@ msgstr "
  "explizit <literal>install</literal> für das Paket auszuführen, das APT nicht "
  "unmittelbar konfigurieren kann. Stellen Sie aber bitte sicher, dass Sie Ihr "
  "Problem außerdem an Ihre Distribution und an das APT-Team mit dem "
- "Fehlerverweis unten melden, so dass sie an der Verbesserung und Korrektur des "
- "Upgrade-Prozesses arbeiten können."
+ "Fehlerverweis unten melden, so dass sie an der Verbesserung und Korrektur "
+ "des Upgrade-Prozesses arbeiten können."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:235
@@@ -3686,8 -3670,8 +3686,8 @@@ msgstr "
  "Funktion hängt jedoch von der Richtigkeit der Zeiteinstellung auf dem "
  "Anwendersystem ab. Archivbetreuer sind aufgefordert, Release-Dateien mit der "
  "Kopfzeile <literal>Valid-Until</literal> zu erstellen. Falls sie das nicht "
- "tun oder ein strengerer Wert gewünscht wird, kann die Option "
- "<literal>Max-ValidTime</literal> unten benutzt werden."
+ "tun oder ein strengerer Wert gewünscht wird, kann die Option <literal>Max-"
+ "ValidTime</literal> unten benutzt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:304
@@@ -3701,13 -3685,12 +3701,12 @@@ msgid "
  "the label of the archive to the option name."
  msgstr ""
  "maximale Zeit (in Sekunden) nach der Erzeugung (die in der Kopfzeile "
- "<literal>Date</literal> angegeben ist), die die Datei "
- "<filename>Release</filename> als gültig angesehen wird. Falls die "
- "Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile "
- "enthält, wird das frühere der beiden Daten als Ablaufdatum verwandt. Vorgabe "
- "ist <literal>0</literal>, was für »für immer gültig« steht. Archivspezifische "
- "Einstellungen können durch Anhängen der Archivbezeichnung an den Optionsnamen "
- "vorgenommen werden."
+ "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
+ "filename> als gültig angesehen wird. Falls die Release-Datei selbst eine "
+ "<literal>Valid-Until</literal>-Kopfzeile enthält, wird das frühere der "
+ "beiden Daten als Ablaufdatum verwandt. Vorgabe ist <literal>0</literal>, was "
+ "für »für immer gültig« steht. Archivspezifische Einstellungen können durch "
+ "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:316
@@@ -3721,13 -3704,13 +3720,13 @@@ msgid "
  "label of the archive to the option name."
  msgstr ""
  "minimale Zeit (in Sekunden), nach der Erzeugung (die in der Kopfzeile "
- "<literal>Date</literal> angegeben ist), die die Datei "
- "<filename>Release</filename> als gültig angesehen wird. Benutzen Sie dies, "
- "falls Sie einen selten aktualisierten (lokalen) Spiegel eines häufiger "
- "aktualisierten Archivs mit einer <literal>Valid-Until</literal>-Kopfzeile "
- "haben, anstatt die Überprüfung des Ablaufdatums komplett zu deaktivieren. "
- "Archivspezifische Einstellungen können und sollten durch Anhängen der "
- "Archivbezeichnung an den Optionsnamen vorgenommen werden."
+ "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
+ "filename> als gültig angesehen wird. Benutzen Sie dies, falls Sie einen "
+ "selten aktualisierten (lokalen) Spiegel eines häufiger aktualisierten "
+ "Archivs mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt "
+ "die Überprüfung des Ablaufdatums komplett zu deaktivieren. Archivspezifische "
+ "Einstellungen können und sollten durch Anhängen der Archivbezeichnung an den "
+ "Optionsnamen vorgenommen werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:328
@@@ -3737,8 -3720,8 +3736,8 @@@ msgid "
  "by default."
  msgstr ""
  "versucht Unterschiede, die <literal>PDiffs</literal> genannt werden, für "
- "Indexe (wie <filename>Packages</filename>-Dateien) herunterzuladen, statt der "
- "kompletten Dateien. Vorgabe ist True."
+ "Indexe (wie <filename>Packages</filename>-Dateien) herunterzuladen, statt "
+ "der kompletten Dateien. Vorgabe ist True."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:331
@@@ -3753,10 -3736,10 +3752,10 @@@ msgstr "
  "Es sind außerdem zwei Unteroptionen verfügbar, um die Benutzung von PDiffs "
  "zu begrenzen: <literal>FileLimit</literal> kann verwandt werden, um die "
  "maximale Anzahl von PDiff-Dateien anzugeben, die zum Aktualisieren einer "
- "Datei heruntergeladen werden sollen. Andererseits gibt "
- "<literal>SizeLimit</literal> die maximale Prozentzahl der Größe aller Patches "
- "im Vergleich zur Zieldatei an. Wenn eine dieser Begrenzungen überschritten "
- "wird, wird die komplette Datei anstelle der Patche heruntergeladen."
+ "Datei heruntergeladen werden sollen. Andererseits gibt <literal>SizeLimit</"
+ "literal> die maximale Prozentzahl der Größe aller Patches im Vergleich zur "
+ "Zieldatei an. Wenn eine dieser Begrenzungen überschritten wird, wird die "
+ "komplette Datei anstelle der Patche heruntergeladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:341
@@@ -3805,13 -3788,12 +3804,12 @@@ msgid "
  "be used."
  msgstr ""
  "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er "
- "wird standardmäßig in der Form "
- "<literal>http://[[Anwender][:Passwort]@]Rechner[:Port]/</literal> angegeben. "
- "Durch Rechner-Proxies kann außerdem in der Form "
- "<literal>http::Proxy::&lt;host&gt;</literal> mit dem speziellen Schlüsselwort "
- "<literal>DIRECT</literal> angegeben werden, dass keine Proxies benutzt "
- "werden. Falls keine der obigen Einstellungen angegeben wurde, wird die "
- "Umgebungsvariable <envar>http_proxy</envar> benutzt."
+ "wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]"
+ "Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in "
+ "der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem speziellen "
+ "Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies "
+ "benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird "
+ "die Umgebungsvariable <envar>http_proxy</envar> benutzt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:367
@@@ -3824,15 -3806,15 +3822,15 @@@ msgid "
  "store the requested archive files in its cache, which can be used to prevent "
  "the proxy from polluting its cache with (big) .deb files."
  msgstr ""
- "Für die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen "
- "Proxy-Zwischenspeichern stehen drei Einstellungen zur Verfügung. "
- "<literal>No-Cache</literal> teilt dem Proxy mit, dass er unter keinen "
- "Umständen seine zwischengespeicherten Antworten benutzen soll, "
- "<literal>Max-Age</literal> setzt das maximal erlaubte Alter einer Indexdatei "
- "im Zwischenspeicher des Proxys (in Sekunden). <literal>No-Store</literal> "
- "gibt an, dass der Proxy die angefragten Archivdateien nicht in seinem "
- "Zwischenspeicher ablegen soll. Das kann verwandt werden, um zu verhindern, "
- "dass der Proxy seinen Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
+ "Für die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen Proxy-"
+ "Zwischenspeichern stehen drei Einstellungen zur Verfügung. <literal>No-"
+ "Cache</literal> teilt dem Proxy mit, dass er unter keinen Umständen seine "
+ "zwischengespeicherten Antworten benutzen soll, <literal>Max-Age</literal> "
+ "setzt das maximal erlaubte Alter einer Indexdatei im Zwischenspeicher des "
+ "Proxys (in Sekunden). <literal>No-Store</literal> gibt an, dass der Proxy "
+ "die angefragten Archivdateien nicht in seinem Zwischenspeicher ablegen soll. "
+ "Das kann verwandt werden, um zu verhindern, dass der Proxy seinen "
+ "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:377 apt.conf.5.xml:449
@@@ -3942,23 -3924,22 +3940,22 @@@ msgstr "
  "Die Unteroption <literal>CaInfo</literal> gibt den Ort an, an dem "
  "Informationen über vertrauenswürdige Zertifikate bereitgehalten werden. "
  "<literal>&lt;host&gt;::CaInfo</literal> ist die entsprechende Option pro "
- "Rechner. Die boolsche Unteroption <literal>Verify-Peer</literal> entscheidet, "
- "ob das Rechnerzertifikat des Servers mit den vertrauenswürdigen Zertifikaten "
- "geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-Peer</literal> "
- "ist die entsprechende Option pro Rechner. Die boolsche Unteroption "
- "<literal>Verify-Host</literal> entscheidet, ob der Rechnername des Servers "
- "geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-Host</literal> "
- "ist die entsprechende Option pro Rechner. <literal>SslCert</literal> "
- "entscheidet, welches Zertifikat zur Client-Authentifizierung benutzt wird. "
- "<literal>&lt;host&gt;::SslCert</literal> ist die entsprechende "
+ "Rechner. Die boolsche Unteroption <literal>Verify-Peer</literal> "
+ "entscheidet, ob das Rechnerzertifikat des Servers mit den vertrauenswürdigen "
+ "Zertifikaten geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-"
+ "Peer</literal> ist die entsprechende Option pro Rechner. Die boolsche "
+ "Unteroption <literal>Verify-Host</literal> entscheidet, ob der Rechnername "
+ "des Servers geprüft werden soll oder nicht. <literal>&lt;host&gt;::Verify-"
+ "Host</literal> ist die entsprechende Option pro Rechner. <literal>SslCert</"
+ "literal> entscheidet, welches Zertifikat zur Client-Authentifizierung "
+ "benutzt wird. <literal>&lt;host&gt;::SslCert</literal> ist die entsprechende "
  "Option pro Rechner. <literal>SslKey</literal> entscheidet, welcher private "
- "Schlüssel für die Client-Authentifizierung benutzt werden. "
- "<literal>&lt;host&gt;::SslKey</literal> ist die entsprechende Option pro "
- "Rechner. <literal>SslForceVersion</literal> überschreibt die zu "
- "benutzende Standard-SSL-Version. Es kann die beiden Zeichenketten "
- "»<literal>TLSv1</literal>« oder »<literal>SSLv3</literal>« enthalten. Die "
- "entsprechende Option pro Rechner ist "
- "<literal>&lt;host&gt;::SslForceVersion</literal>."
+ "Schlüssel für die Client-Authentifizierung benutzt werden. <literal>&lt;"
+ "host&gt;::SslKey</literal> ist die entsprechende Option pro Rechner. "
+ "<literal>SslForceVersion</literal> überschreibt die zu benutzende Standard-"
+ "SSL-Version. Es kann die beiden Zeichenketten »<literal>TLSv1</literal>« "
+ "oder »<literal>SSLv3</literal>« enthalten. Die entsprechende Option pro "
+ "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:432
@@@ -3979,22 -3960,21 +3976,21 @@@ msgid "
  "literal> and <literal>$(SITE_PORT)</literal>."
  msgstr ""
  "<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
- "benutzt werden soll. Er wird standardmäßig in der Form "
- "<literal>ftp://[[Anwender][:Passwort]@]Rechner[:Port]/</literal> angegeben. "
- "Proxys pro Rechner können außerdem in der Form "
- "<literal>ftp::Proxy::&lt;host&gt;</literal> angegeben werden. Hierbei "
- "bedeutet das spezielle Schlüsselwort <literal>DIRECT</literal>, dass keine "
- "Proxys benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, "
- "wird die Umgebungsvariable <envar>ftp_proxy</envar> benutzt. Um einen FTP-"
- "Proxy zu benutzen, müssen Sie in der Konfigurationsdatei das Skript "
- "<literal>ftp::ProxyLogin</literal> setzen. Dieser Eintrag gibt die Befehle "
- "an, die gesendet werden müssen, um dem Proxy-Server mitzuteilen, womit er "
- "sich verbinden soll. Ein Beispiel, wie das funktioniert, finden Sie unter "
- "&configureindex;. Die Platzhaltervariablen, die für den zugehörigen "
- "URI-Bestandteil stehen, sind <literal>$(PROXY_USER)</literal>, "
- "<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
- "<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> und "
- "<literal>$(SITE_PORT)</literal>."
+ "benutzt werden soll. Er wird standardmäßig in der Form <literal>ftp://"
+ "[[Anwender][:Passwort]@]Rechner[:Port]/</literal> angegeben. Proxys pro "
+ "Rechner können außerdem in der Form <literal>ftp::Proxy::&lt;host&gt;</"
+ "literal> angegeben werden. Hierbei bedeutet das spezielle Schlüsselwort "
+ "<literal>DIRECT</literal>, dass keine Proxys benutzt werden. Falls keine der "
+ "obigen Einstellungen angegeben wurde, wird die Umgebungsvariable "
+ "<envar>ftp_proxy</envar> benutzt. Um einen FTP-Proxy zu benutzen, müssen Sie "
+ "in der Konfigurationsdatei das Skript <literal>ftp::ProxyLogin</literal> "
+ "setzen. Dieser Eintrag gibt die Befehle an, die gesendet werden müssen, um "
+ "dem Proxy-Server mitzuteilen, womit er sich verbinden soll. Ein Beispiel, "
+ "wie das funktioniert, finden Sie unter &configureindex;. Die "
+ "Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, sind "
+ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+ "$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+ "literal> und <literal>$(SITE_PORT)</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:452
@@@ -4061,15 -4041,15 +4057,15 @@@ msgid "
  "<literal>cdrom</literal> block. It is important to have the trailing slash.  "
  "Unmount commands can be specified using UMount."
  msgstr ""
- "Für URIs, die die Methode <literal>cdrom</literal> verwenden, ist die einzige "
- "Option der Einhängepunkt, <literal>cdrom::Mount</literal>, der der "
+ "Für URIs, die die Methode <literal>cdrom</literal> verwenden, ist die "
+ "einzige Option der Einhängepunkt, <literal>cdrom::Mount</literal>, der der "
  "Einhängepunkt des CD-ROM-Laufwerks sein muss (oder der DVD oder was auch "
  "immer), wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist "
  "möglich, alternative Ein- und Aushängebefehle anzugeben, falls Ihr "
  "Einhängepunkt nicht in der fstab aufgeführt werden kann. Die Syntax besteht "
- "darin, <placeholder type=\"literallayout\" id=\"0\"/> in den "
- "<literal>cdrom</literal>-Block einzufügen. Der abschließende Schrägstrich ist "
- "wichtig. Aushängebefehle können per UMount angegeben werden."
+ "darin, <placeholder type=\"literallayout\" id=\"0\"/> in den <literal>cdrom</"
+ "literal>-Block einzufügen. Der abschließende Schrägstrich ist wichtig. "
+ "Aushängebefehle können per UMount angegeben werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:486
@@@ -4077,9 -4057,8 +4073,8 @@@ msgid "
  "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
  "literal>, which passes additional parameters to gpgv."
  msgstr ""
- "Die einzige Konfigurationsoption für GPGV-URIs ist "
- "<literal>gpgv::Options</literal>, um zusätzliche Parameter an Gpgv "
- "weiterzuleiten."
+ "Die einzige Konfigurationsoption für GPGV-URIs ist <literal>gpgv::Options</"
+ "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
  #: apt.conf.5.xml:497
@@@ -4144,13 -4123,12 +4139,12 @@@ msgstr "
  "einfach den bevorzugten Typ an erster Stelle in die Liste ein – noch nicht "
  "hinzugefügte Standardtypen werden implizit an das Ende der Liste angehängt, "
  "so kann z.B. <placeholder type=\"synopsis\" id=\"0\"/> verwandt werden, um "
- "<command>gzip</command>-komprimierte Dateien gegenüber "
- "<command>bzip2</command> und <command>lzma</command> zu bevorzugen. Falls "
- "<command>lzma</command> vor <command>gzip</command> und "
- "<command>bzip2</command> bevorzugt werden soll, sollte die "
- "Konfigurationseinstellung so aussehen: <placeholder type=\"synopsis\" "
- "id=\"1\"/>. Es ist nicht nötig, <literal>bz2</literal> explizit zur Liste "
- "hinzuzufügen, da es automatisch hinzufügt wird."
+ "<command>gzip</command>-komprimierte Dateien gegenüber <command>bzip2</"
+ "command> und <command>lzma</command> zu bevorzugen. Falls <command>lzma</"
+ "command> vor <command>gzip</command> und <command>bzip2</command> bevorzugt "
+ "werden soll, sollte die Konfigurationseinstellung so aussehen: <placeholder "
+ "type=\"synopsis\" id=\"1\"/>. Es ist nicht nötig, <literal>bz2</literal> "
+ "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
  #: apt.conf.5.xml:512
@@@ -4180,9 -4158,9 +4174,9 @@@ msgstr "
  "der Befehlszeile eingegebene Einträge an das Ende der Liste angehängt "
  "werden, die in den Konfigurationsdateien angegeben wurde, aber vor den "
  "Standardeinträgen. Um einen Typ in diesem Fall gegenüber einem, der über die "
- "Konfigurationsdatei angegebenen wurde, zu bevorzugen, können Sie diese Option "
- "direkt setzen – nicht im Listenstil. Dies wird die definierte Liste nicht "
- "überschreiben, es wird diesen Typ nur vor die Liste setzen."
+ "Konfigurationsdatei angegebenen wurde, zu bevorzugen, können Sie diese "
+ "Option direkt setzen – nicht im Listenstil. Dies wird die definierte Liste "
+ "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:517
@@@ -4221,14 -4199,14 +4215,14 @@@ msgid "
  "<filename>Translation</filename> files for every language - the long "
  "language codes are especially rare."
  msgstr ""
- "Der Unterabschnitt Languages steuert, welche <filename>Translation</filename>-"
- "Dateien heruntergeladen werden und in welcher Reihenfolge APT versucht, die "
- "Beschreibungsübersetzungen anzuzeigen. APT wird versuchen, die erste "
- "verfügbare Beschreibung für die zuerst aufgelistete Sprache anzuzeigen. "
- "Sprachen können durch ihre kurzen oder langen Sprachcodes definiert sein. "
- "Beachten Sie, dass nicht alle Archive "
- "<filename>Translation</filename>-Dateien für jede Sprache bereitstellen – "
- "insbesondere sind die langen Sprachcodes selten."
+ "Der Unterabschnitt Languages steuert, welche <filename>Translation</"
+ "filename>-Dateien heruntergeladen werden und in welcher Reihenfolge APT "
+ "versucht, die Beschreibungsübersetzungen anzuzeigen. APT wird versuchen, die "
+ "erste verfügbare Beschreibung für die zuerst aufgelistete Sprache "
+ "anzuzeigen. Sprachen können durch ihre kurzen oder langen Sprachcodes "
+ "definiert sein. Beachten Sie, dass nicht alle Archive <filename>Translation</"
+ "filename>-Dateien für jede Sprache bereitstellen – insbesondere sind die "
+ "langen Sprachcodes selten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
  #: apt.conf.5.xml:549
@@@ -4270,12 -4248,12 +4264,12 @@@ msgstr "
  "passenden <filename>Translation</filename>-Datei stoppen wird. Dies weist "
  "APT an, diese Übersetzungen auch herunterzuladen, ohne sie tatsächlich zu "
  "verwenden, es sei denn, die Umgebungsvariable gibt diese Sprachen an. Daher "
- "wird die folgende Beispielkonfiguration in einer englischen Lokalisierung "
- "zu der Reihenfolge »en,de« und in einer deutschen Lokalisierung zu »de,en« "
+ "wird die folgende Beispielkonfiguration in einer englischen Lokalisierung zu "
+ "der Reihenfolge »en,de« und in einer deutschen Lokalisierung zu »de,en« "
  "führen. Beachten Sie, dass »fr« heruntergeladen, aber nicht benutzt wird, "
  "falls APT nicht in einer französischen Lokalisierung benutzt wird (wobei die "
- "Reihenfolge »fr, de, en« wäre). <placeholder type=\"programlisting\" "
- "id=\"0\"/>"
+ "Reihenfolge »fr, de, en« wäre). <placeholder type=\"programlisting\" id="
+ "\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:550
@@@ -4540,8 -4518,8 +4534,8 @@@ msgstr "
  "ausgeführt werden. Wie <literal>options</literal> muss dies in "
  "Listenschreibweise angegeben werden. Die Befehle werden der Reihenfolge nach "
  "mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird "
- "APT abgebrochen. APT wird den Befehlen die Dateinamen aller .deb-Dateien, die "
- "es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile."
+ "APT abgebrochen. APT wird den Befehlen die Dateinamen aller .deb-Dateien, "
+ "die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:680
@@@ -4597,11 -4575,11 +4591,11 @@@ msgid "
  "reporting such that all front-ends will currently stay around half (or more) "
  "of the time in the 100% state while it actually configures all packages."
  msgstr ""
- "APT kann &dpkg; auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
- "über mehrere &dpkg;-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
- "&dpkg; Trigger nur einmal bei jeder Ausführung benutzen. Diese Optionen zu "
- "aktivieren, kann daher die zum Installieren oder Upgrade benötigte Zeit "
- "verkürzen. Beachten Sie, dass geplant ist, diese Optionen in "
+ "APT kann &dpkg; auf eine Art aufrufen, in der aggressiv Gebrauch von "
+ "Triggern über mehrere &dpkg;-Aufrufe hinweg gemacht wird. Ohne weitere "
+ "Optionen wird &dpkg; Trigger nur einmal bei jeder Ausführung benutzen. Diese "
+ "Optionen zu aktivieren, kann daher die zum Installieren oder Upgrade "
+ "benötigte Zeit verkürzen. Beachten Sie, dass geplant ist, diese Optionen in "
  "Zukunft standardmäßig zu aktivieren, aber da es die Art, wie APT &dpkg; "
  "aufruft, drastisch ändert, benötigt es noch viele weitere Tests. "
  "<emphasis>Diese Optionen sind daher aktuell noch experimentell und sollten "
@@@ -4690,17 -4668,17 +4684,17 @@@ msgid "
  msgstr ""
  "Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« und "
  "»<literal>no</literal>«. Der Standardwert ist »<literal>all</literal>«, was  "
- "APT veranlasst, alle Pakete zu konfigurieren. Die Art von "
- "»<literal>smart</literal>« ist es, nur die Pakete zu konfigurieren, die "
- "konfiguriert werden müssen, bevor ein anderes Paket entpackt werden kann "
- "(Pre-Depends), und den Rest von &dpkg; mit einem Aufruf, der durch die Option "
- "ConfigurePending (siehe unten) generiert wurde, konfigurieren zu lassen. Im "
- "Gegensatz dazu wird »<literal>no</literal>« nichts konfigurieren und sich "
- "völlig auf die Konfiguration durch &dpkg; verlassen (was im Moment "
- "fehlschlägt, falls ein Pre-Depends vorkommt). Diese Option auf etwas anderes "
- "als <literal>all</literal> zu setzen, wird außerdem implizit standardmäßig "
- "die nächste Option aktivieren, da das System anderenfalls in einem nicht "
- "konfigurierten Status enden könnte und möglicherweise nicht mehr startbar ist."
+ "APT veranlasst, alle Pakete zu konfigurieren. Die Art von »<literal>smart</"
+ "literal>« ist es, nur die Pakete zu konfigurieren, die konfiguriert werden "
+ "müssen, bevor ein anderes Paket entpackt werden kann (Pre-Depends), und den "
+ "Rest von &dpkg; mit einem Aufruf, der durch die Option ConfigurePending "
+ "(siehe unten) generiert wurde, konfigurieren zu lassen. Im Gegensatz dazu "
+ "wird »<literal>no</literal>« nichts konfigurieren und sich völlig auf die "
+ "Konfiguration durch &dpkg; verlassen (was im Moment fehlschlägt, falls ein "
+ "Pre-Depends vorkommt). Diese Option auf etwas anderes als <literal>all</"
+ "literal> zu setzen, wird außerdem implizit standardmäßig die nächste Option "
+ "aktivieren, da das System anderenfalls in einem nicht konfigurierten Status "
+ "enden könnte und möglicherweise nicht mehr startbar ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:744
@@@ -5183,10 -5161,10 +5177,10 @@@ msgstr "
  "(zum Beispiel <literal>stable</literal> und <literal>testing</literal>). APT "
  "weist jeder verfügbaren Version eine Priorität zu. Je nach "
  "Abhängigkeitsbedingungen wählt <command>apt-get</command> die Version mit "
- "der höchsten Priorität zur Installation aus. Die APT-Einstellungen setzen die "
- "Prioritäten außer Kraft, die APT den Paketversionen standardmäßig zuweist, "
- "was dem Anwender die Kontrolle darüber gibt, welche zur Installation "
- "ausgewählt wird."
+ "der höchsten Priorität zur Installation aus. Die APT-Einstellungen setzen "
+ "die Prioritäten außer Kraft, die APT den Paketversionen standardmäßig "
+ "zuweist, was dem Anwender die Kontrolle darüber gibt, welche zur "
+ "Installation ausgewählt wird."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:52
@@@ -5775,8 -5753,8 +5769,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -5789,8 -5767,8 +5783,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -5803,8 -5781,8 +5797,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -5818,8 -5796,8 +5812,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -5833,8 -5811,8 +5827,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339
@@@ -6551,11 -6529,11 +6545,11 @@@ msgid "
  "and a <literal>#</literal> character anywhere on a line marks the remainder "
  "of that line as a comment."
  msgstr ""
- "Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. "
- "<literal>deb-src</literal>) gefolgt von Optionen und Argumenten für diesen "
- "Typ. Einzelne Einträge können nicht auf einer folgenden Zeile fortgesetzt "
- "werden. Leere Zeilen werden ignoriert und ein <literal>#</literal>-Zeichen "
- "irgendwo in einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
+ "Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. <literal>deb-"
+ "src</literal>) gefolgt von Optionen und Argumenten für diesen Typ. Einzelne "
+ "Einträge können nicht auf einer folgenden Zeile fortgesetzt werden. Leere "
+ "Zeilen werden ignoriert und ein <literal>#</literal>-Zeichen irgendwo in "
+ "einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
  
  #. type: Content of: <refentry><refsect1><title>
  #: sources.list.5.xml:53
@@@ -6841,14 -6819,15 +6835,15 @@@ msgid "
  "variable. Proxies using HTTP specified in the configuration file will be "
  "ignored."
  msgstr ""
- "Das ftp-Schema gibt einen FTP-Server für das Archiv an. Das FTP-Verhalten von "
- "APT ist in hohem Maße konfigurierbar. Um weitere Informationen zu erhalten, "
- "lesen Sie die &apt-conf;-Handbuchseite. Bitte beachten Sie, dass ein "
- "FTP-Proxy durch Benutzung der <envar>ftp_proxy</envar>-Umgebungsvariablen "
- "angegeben werden kann. Es ist mittels dieser Umgebungsvariable und "
- "<emphasis>nur</emphasis> dieser Umgebungsvariable möglich, einen HTTP-Proxy "
- "anzugeben (HTTP-Proxy-Server verstehen oft auch FTP-URLs). FTP-Proxys, die "
- "gemäß Angabe in der Konfigurationsdatei HTTP benutzen, werden ignoriert."
+ "Das ftp-Schema gibt einen FTP-Server für das Archiv an. Das FTP-Verhalten "
+ "von APT ist in hohem Maße konfigurierbar. Um weitere Informationen zu "
+ "erhalten, lesen Sie die &apt-conf;-Handbuchseite. Bitte beachten Sie, dass "
+ "ein FTP-Proxy durch Benutzung der <envar>ftp_proxy</envar>-"
+ "Umgebungsvariablen angegeben werden kann. Es ist mittels dieser "
+ "Umgebungsvariable und <emphasis>nur</emphasis> dieser Umgebungsvariable "
+ "möglich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server verstehen oft auch "
+ "FTP-URLs). FTP-Proxys, die gemäß Angabe in der Konfigurationsdatei HTTP "
+ "benutzen, werden ignoriert."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: sources.list.5.xml:184
@@@ -6896,11 -6875,10 +6891,10 @@@ msgstr "
  "APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
  "werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
  "replaceable></literal> folgen sollten, erweitert werden. Das APT-Team "
- "betreut zum Beispiel außerdem das Paket "
- "<literal>apt-transport-https</literal>, das Zugriffsmethoden für HTTPS-URIs "
- "mit Funktionen bereitstellt, die denen der HTTP-Methode ähneln. Außerdem sind "
- "z.B. Methoden für die Benutzung von debtorrent verfügbar – siehe"
- " &apt-transport-debtorrent;."
+ "betreut zum Beispiel außerdem das Paket <literal>apt-transport-https</"
+ "literal>, das Zugriffsmethoden für HTTPS-URIs mit Funktionen bereitstellt, "
+ "die denen der HTTP-Methode ähneln. Außerdem sind z.B. Methoden für die "
+ "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:212
@@@ -7635,15 -7613,16 +7629,16 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:307
  msgid ""
- "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
- "</filename>. If this setting causes multiple Packages files to map onto a "
- "single Contents file (as is the default)  then <command>apt-ftparchive</"
- "command> will integrate those package files together automatically."
+ "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
+ "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
+ "to map onto a single Contents file (as is the default)  then <command>apt-"
+ "ftparchive</command> will integrate those package files together "
+ "automatically."
  msgstr ""
- "setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/Contents-"
- "$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere Packages-"
- "Dateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es "
- "Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
+ "setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
+ "Contents-$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere "
+ "Packages-Dateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie "
+ "es Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
  "automatisch integrieren."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

diff --combined doc/po/es.po
index 4a88e718c4c376224709db3283d8118b09e0962e,374af43e9c90a908b2811dbcc64a94ef12718fa8..559f5659fcad68f3e00cfd517275514296c68a37
--- 1/doc/po/es.po
--- 2/doc/po/es.po
+++ b/doc/po/es.po
@@@ -38,7 -38,7 +38,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.9.7.1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-25 09:17+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2012-07-14 12:21+0200\n"
  "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
  "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@@ -2334,8 -2334,8 +2334,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  "Actualiza el registro de claves local con el registro de claves del archivo "
  "y elimina del registro local las claves de archivo que ya no son válidas. El "
@@@ -2404,33 -2404,24 +2404,33 @@@ msgstr "Base de datos local de las clav
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Registro de las claves de confianza del archivo de Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -5785,8 -5776,8 +5785,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -5799,8 -5790,8 +5799,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -5813,8 -5804,8 +5813,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -5828,8 -5819,8 +5828,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -5842,8 -5833,8 +5842,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339

diff --combined doc/po/fr.po
index 5484b561d8f67972ce9e0b89f4907cfdaceb8521,a1def193a005b80ffbca45282cd2a7e2af0c85c3..06ed877d204cc2cef961ecc44dffeb1e92818670
--- 1/doc/po/fr.po
--- 2/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: \n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-08-28 12:02+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2012-07-04 21:08-0600\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@@ -2261,8 -2261,8 +2261,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
  "l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de "
@@@ -2331,33 -2331,24 +2331,33 @@@ msgstr "Base de données locale de fiab
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Trousseau des clés fiables de l'archive Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -5738,8 -5729,8 +5738,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -5752,8 -5743,8 +5752,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -5767,8 -5758,8 +5767,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -5781,8 -5772,8 +5781,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -5795,8 -5786,8 +5795,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339

diff --combined doc/po/it.po
index ab1962bf102d94d8d966b2b5c304bbf72784facc,716a2ee6efb7b9a84c2594eeaf2ec06d42f2ca2f..c0c1254e437657329b4f5ef112ded25a887efba4
--- 1/doc/po/it.po
--- 2/doc/po/it.po
+++ b/doc/po/it.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: \n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-09 22:05+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2003-04-26 23:26+0100\n"
  "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
  "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@@ -1586,8 -1586,8 +1586,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -1636,23 -1636,23 +1636,23 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -3961,8 -3961,8 +3961,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr ""
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -3973,8 -3973,8 +3973,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr ""
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -3985,8 -3985,8 +3985,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr ""
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -3997,8 -3997,8 +3997,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr ""
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -4009,8 -4009,8 +4009,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr ""
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339
@@@ -4022,7 -4022,7 +4022,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
- msgstr ""
+ msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:344
@@@ -5301,10 -5301,11 +5301,11 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:307
  msgid ""
- "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
- "</filename>. If this setting causes multiple Packages files to map onto a "
- "single Contents file (as is the default)  then <command>apt-ftparchive</"
- "command> will integrate those package files together automatically."
+ "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
+ "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
+ "to map onto a single Contents file (as is the default)  then <command>apt-"
+ "ftparchive</command> will integrate those package files together "
+ "automatically."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

diff --combined doc/po/ja.po
index b1c3926efe469e57f8fb14ffce65095dbd82c887,8549d4bb6dde62029eeadc8482f309b9065d4f91..f54e8211ff83e3805b76b534c84ad5b2c3179e8b
--- 1/doc/po/ja.po
--- 2/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-29 14:26+0300\n"
+ "POT-Creation-Date: 2012-08-30 22:07+0300\n"
  "PO-Revision-Date: 2012-08-08 07:58+0900\n"
  "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@@ -2219,8 -2219,8 +2219,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
  "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
@@@ -2287,33 -2287,24 +2287,33 @@@ msgstr "ã\82¢ã\83¼ã\82«ã\82¤ã\83\96ã\82­ã\83¼ã\81®ã\83­ã\83¼ã
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Debian アーカイブ信頼キーのキーリングです。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -5503,8 -5494,8 +5503,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -5516,8 -5507,8 +5516,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -5530,8 -5521,8 +5530,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -5544,8 -5535,8 +5544,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -5559,8 -5550,8 +5559,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339

diff --combined doc/po/pl.po
index f1e5e8f32714e773ba8c5e26cffaa3d44a89e4f8,c6dbde448e5e7508e97c816d59b6b209a7102af3..7ab2649eb1af359529c6428935cd9110cd799675
--- 1/doc/po/pl.po
--- 2/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -11,7 -11,7 +11,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.9.7.3\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-07-28 21:59+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2012-07-28 21:59+0200\n"
  "Last-Translator: Robert Luberda <robert@debian.org>\n"
  "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@@ -2366,8 -2366,8 +2366,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i "
  "usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy "
@@@ -2436,33 -2436,24 +2436,33 @@@ msgstr "Lokalna składnica zaufanych kl
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Składnica zaufanych kluczy archiwum Debiana."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -5205,8 -5196,8 +5205,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -5219,8 -5210,8 +5219,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;= 1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -5233,8 -5224,8 +5233,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;= 990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -5248,8 -5239,8 +5248,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;= 500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -5262,8 -5253,8 +5262,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;= 100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339

diff --combined doc/po/pt.po
index 233d6e17a89428cb180b95a92aade01fa6c346e8,3fa029709a0ab7cc1cdf59760363c92d6fea7ee5..38ffefe496943c27d6599510b132564e78e42be9
--- 1/doc/po/pt.po
--- 2/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.8.0~pre1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-09 22:05+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2010-08-25 23:07+0100\n"
  "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
  "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@@ -2332,8 -2332,8 +2332,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -2398,33 -2398,24 +2398,33 @@@ msgstr "Base de dados local de confianÃ
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +#, fuzzy
 +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
 +#, fuzzy
 +#| msgid ""
 +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +#, fuzzy
 +#| msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -6127,8 -6118,8 +6127,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -6141,8 -6132,8 +6141,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -6155,8 -6146,8 +6155,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -6170,8 -6161,8 +6170,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -6185,8 -6176,8 +6185,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt; P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339
@@@ -8035,10 -8026,11 +8035,11 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:307
  msgid ""
- "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
- "</filename>. If this setting causes multiple Packages files to map onto a "
- "single Contents file (as is the default)  then <command>apt-ftparchive</"
- "command> will integrate those package files together automatically."
+ "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
+ "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
+ "to map onto a single Contents file (as is the default)  then <command>apt-"
+ "ftparchive</command> will integrate those package files together "
+ "automatically."
  msgstr ""
  "Define a saída do ficheiro Contents. A predefinição é <filename>$(DIST)/"
  "Contents-$(ARCH)</filename>. Se esta definição causar múltiplos ficheiros "

diff --combined doc/po/pt_BR.po
index 5ef3628b55eb13944abda611a931d84aeca0a91a,18a6c3142510b21e45996ce84216747a04f68e50..665ed73f9c56627ef3d3409fe171cdc85a9c5db1
--- 1/doc/po/pt_BR.po
--- 2/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2012-06-09 22:05+0300\n"
+ "POT-Creation-Date: 2012-08-30 12:50+0300\n"
  "PO-Revision-Date: 2004-09-20 17:02+0000\n"
  "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
  "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@@ -1618,8 -1618,8 +1618,8 @@@ msgid "
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -1669,23 -1669,23 +1669,23 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:187
  msgid ""
 -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -4171,9 -4171,8 +4171,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:315
- #, fuzzy
- msgid "P &gt; 1000"
- msgstr "P &gt; 1000"
+ msgid "P &gt;= 1000"
+ msgstr "P &gt;= 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:316
@@@ -4187,9 -4186,8 +4186,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:320
- #, fuzzy
- msgid "990 &lt; P &lt;=1000"
- msgstr "990 &lt; P &lt;=1000"
+ msgid "990 &lt;= P &lt; 1000"
+ msgstr "990 &lt;= P &lt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:321
@@@ -4203,9 -4201,8 +4201,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:326
- #, fuzzy
- msgid "500 &lt; P &lt;=990"
- msgstr "500 &lt; P &lt;=990"
+ msgid "500 &lt;= P &lt; 990"
+ msgstr "500 &lt;= P &lt; 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:327
@@@ -4219,9 -4216,8 +4216,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:332
- #, fuzzy
- msgid "100 &lt; P &lt;=500"
- msgstr "100 &lt; P &lt;=500"
+ msgid "100 &lt;= P &lt; 500"
+ msgstr "100 &lt;= P &lt; 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:333
@@@ -4236,9 -4232,8 +4232,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:338
- #, fuzzy
- msgid "0 &lt; P &lt;=100"
- msgstr "0 &lt;= P &lt;=100"
+ msgid "0 &lt; P &lt; 100"
+ msgstr "0 &lt; P &lt; 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:339
@@@ -4252,7 -4247,6 +4247,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:343
- #, fuzzy
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
@@@ -5767,10 -5761,11 +5761,11 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:307
  msgid ""
- "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
- "</filename>. If this setting causes multiple Packages files to map onto a "
- "single Contents file (as is the default)  then <command>apt-ftparchive</"
- "command> will integrate those package files together automatically."
+ "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
+ "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
+ "to map onto a single Contents file (as is the default)  then <command>apt-"
+ "ftparchive</command> will integrate those package files together "
+ "automatically."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

diff --combined test/integration/framework
index c656157f210b4f27f2409d6604b50fe9c65a35e0,57bf555af3440a67956a4762c1e3ae11f67e9403..bec3212404c05bd433ca619c707d5db648241698
--- 1/test/integration/framework
--- 2/test/integration/framework
+++ b/test/integration/framework
@@@ -91,6 -91,7 +91,7 @@@ runapt() 
  }
  aptconfig() { runapt apt-config $*; }
  aptcache() { runapt apt-cache $*; }
+ aptcdrom() { runapt apt-cdrom $*; }
  aptget() { runapt apt-get $*; }
  aptftparchive() { runapt apt-ftparchive $*; }
  aptkey() { runapt apt-key $*; }
@@@ -523,11 -524,12 +524,12 @@@ insertinstalledpackage() 
        local VERSION="$3"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
+       local STATUS="${6:-install ok installed}"
        local FILE='rootdir/var/lib/dpkg/status'
        local INFO='rootdir/var/lib/dpkg/info'
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
                echo "Package: $NAME
- Status: install ok installed
+ Status: $STATUS
  Priority: $PRIORITY
  Section: other
  Installed-Size: 42
@@@ -688,30 -690,20 +690,30 @@@ signreleasefiles() 
  }
  
  changetowebserver() {
 -      if which weborf > /dev/null; then
 -              weborf -xb aptarchive/ 2>&1 > /dev/null &
 +      if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
 +              msgdie 'Need the aptwebserver when passing arguments'
 +      fi
 +
 +      local LOG='/dev/null'
 +      if test -x ${BUILDDIRECTORY}/aptwebserver; then
 +              cd aptarchive
 +              LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> $LOG > $LOG &
 +              addtrap "kill $!;"
 +              cd - > /dev/null
 +      elif which weborf > /dev/null; then
 +              weborf -xb aptarchive/ 2> $LOG > $LOG &
                addtrap "kill $!;"
        elif which gatling > /dev/null; then
                cd aptarchive
 -              gatling -p 8080 -F -S 2>&1 > /dev/null &
 +              gatling -p 8080 -F -S 2> $LOG > $LOG &
                addtrap "kill $!;"
                cd - > /dev/null
        elif which lighttpd > /dev/null; then
                echo "server.document-root = \"$(readlink -f ./aptarchive)\"
  server.port = 8080
  server.stat-cache-engine = \"disable\"" > lighttpd.conf
 -              lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
 -              lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
 +              lighttpd -t -f lighttpd.conf 2> $LOG > $LOG || msgdie 'Can not change to webserver: our lighttpd config is invalid'
 +              lighttpd -D -f lighttpd.conf 2> $LOG > $LOG &
                addtrap "kill $!;"
        else
                msgdie 'You have to install weborf or lighttpd first'
@@@ -724,6 -716,21 +726,21 @@@
        return 0
  }
  
+ changetocdrom() {
+       mkdir -p rootdir/media/cdrom/.disk
+       local CD="$(readlink -f rootdir/media/cdrom)"
+       echo "acquire::cdrom::mount \"${CD}\";" > rootdir/etc/apt/apt.conf.d/00cdrom
+       echo 'acquire::cdrom::autodetect 0;' >> rootdir/etc/apt/apt.conf.d/00cdrom
+       echo -n "$1" > ${CD}/.disk/info
+       if [ ! -d aptarchive/dists ]; then
+               msgdie 'Flat file archive cdroms can not be created currently'
+               return 1
+       fi
+       mv aptarchive/dists $CD
+       ln -s "$(readlink -f ./incoming)" $CD/pool
+       find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
+ }
+ 
  checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then