From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 22 May 2012 14:07:49 +0000 (+0200)
Subject: merged (and resolved a bunch of conflicts) of the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~73
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/800694cbf33e206935dc9e6e8fa6e9a036b8efad?ds=sidebyside

merged (and resolved a bunch of conflicts) of the debian-sid branch
---

800694cbf33e206935dc9e6e8fa6e9a036b8efad
diff --cc apt-pkg/packagemanager.cc
index cefb760af,46fc499c6..80369dd1a
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@@ -600,8 -602,8 +602,8 @@@ 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;
+    unsigned int i = 0;
     do 
     {
        Changed = false;
diff --cc configure.in
index 3e9692a53,d574c18e5..e27825dc8
--- a/configure.in
+++ b/configure.in
@@@ -17,11 -17,15 +17,15 @@@ AC_INIT(configure.in
  AC_CONFIG_AUX_DIR(buildlib)
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
- dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp12ubuntu7")
  PACKAGE="apt"
 -PACKAGE_VERSION="0.9.4"
++PACKAGE_VERSION="0.9.5ubuntu1~20120522"
+ PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
+ AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
+ AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL")
  AC_SUBST(PACKAGE)
+ AC_SUBST(PACKAGE_VERSION)
+ AC_SUBST(PACKAGE_MAIL)
  
  dnl Check the archs, we want the target type.
  AC_CANONICAL_SYSTEM
diff --cc debian/changelog
index c82c73d0e,568590edb..5a21fb8b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,149 -1,411 +1,570 @@@
++apt (0.9.5ubuntu1) UNRELEASED; urgency=low
++
++  * 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
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 May 2012 15:57:26 +0200
++
+ apt (0.9.5) UNRELEASED; urgency=low
+ 
+   [ Chris Leick ]
+   * proofreading of the manpage pot
+   * German manpage translation update (Closes: #673294)
+ 
+   [ David Kalnischkies ]
+   * buildlib/podomain.mak:
+     - ensure that all sources end up in the srclist so that we don't
+       forget to extract half of the translation strings
+   * buildlib/inttypes.h.in:
+     - remove inttypes.h compatibility as providing such a c99 types
+       compatibility conflicts with the usage of c99 type long long
+   * apt-pkg/contrib/mmap.cc:
+     - have a dummy SyncToFd around in case of ReadOnly access to a
+       compressed file as we otherwise on Close() do not delete[] the
+       char buffer but munmap() it… (Closes: #673815)
+   * debian/control:
+     - moving debiandoc-sgml to Build-Depends-Indep was one step too much
+       for the buildds as we still build two sgml files in arch:any
+   * debian/rules:
+     - move internal-solver as 'apt' to his friend dump-solver in
+       /usr/lib/apt/solvers to avoid writing a manpage for it
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 21 May 2012 15:10:49 +0200
+ 
+ apt (0.9.4) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * methods/http.cc:
+     - after many years of pointless discussions disable http/1.1 pipelining
+       by default as many webservers and proxies seem to be unable to conform
+       to specification must's (rfc2616 section 8.1.2.2) (LP: #996151)
+     - add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11
+   * apt-pkg/pkgcachegen.cc:
+     - make IsDuplicatedDescription static so that it is really private
+       as we don't need a symbol for it as it is not in a header
+   * Makefile, buildlib/*.mak:
+     - reshuffle dependencies so that parallel building seems to work
+     - separate manpages from the rest of the doc building
+   * prepare-release:
+     - apt-inst version isn't apt versions, so don't override variable
+   * debian/rules:
+     - apt-utils packages manpages, so it should depend on build-doc
+     - make apt and apt-utils packages depend on manpages instead of full doc
+   * debian/control:
+     - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs
+       are no longer build in the same target as the manpages
+   * apt-pkg/acquire-methods.cc:
+     - factor out into private Dequeue() to fix access to deleted pointer
+   * apt-pkg/contrib/fileutl.cc:
+     - ensure that we close compressed fds, wait for forks and such even if
+       the FileFd itself is set to not autoclose the given Fd
+   * cmdline/apt-get.cc:
+     - use the host architecture, not the build architecture for matching
+       of [architecture restrictions] in Build-Depends (Closes: #672927)
+   * doc/makefile:
+     - build manpages with the correct l10n.gentext.default.language setting
+       to get the correct section titles provided by docbook
+   * doc/po/de.po:
+     - updated german manpage translation by Chris Leick, thanks!
+   * apt-pkg/packagemanager.cc:
+     - do not run into loop on new-pre-depends-breaks (Closes: #673536)
+   * doc/*.xml:
+     - add a few translator notes and reword some paragraphs to ensure that
+       translators and users alike can better understand them (Closes: #669409)
+     - in <term> mark all options with <option> and mark <term><option>
+       as untranslated for po4a removing ~200 unless "translateable" strings
+   * apt-pkg/aptconfiguration.cc:
+     - longcode Translation files are saved with encoded underscore,
+       so make sure to pick these files up as well for Acquire::Languages
+   * ftparchive/writer.cc:
+     - include Contents-* files in Release files (Closes: #673647)
+ 
+   [ Michael Vogt ]
+   * merged updated de.po, thanks to Holger Wansing (closes: #672466)
+   
+   [ Raphael Geissert ]
+   * apt-pkg/acquire*.cc:
+     - handle redirections in the worker with the right method instead of
+       in the method the redirection occured in (Closes: #668111)
+   * methods/http.cc:
+     - forbid redirects to change protocol
+   * methods/mirror.cc:
+     - generate an equal sign also for the first arch (Closes: #669142)
+ 
+   [ Marius Vollmer ]
+   * apt-pkg/algorithms.cc:
+     - fix memory leak of Flags in pkgSimulate by a proper destructor
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 21 May 2012 12:29:05 +0200
+ 
+ apt (0.9.3) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/strutl.cc:
+     - remove the message size limit from ioprintf and strprintf
+   * apt-pkg/contrib/configuration.cc:
+     - add a more versatile Dump() method
+     - normalize a bit by replacing // and /./ with / in FindFile
+     - /dev/null is a special absolute path as it has no subdirectories
+   * apt-pkg/acquire-worker.cc:
+     - use Dump() to generate the configuration message for sending
+   * cmdline/apt-config.cc:
+     - make it possible to limit dump to a subtree
+     - implement --empty and --format option for dump
+   * apt-pkg/cdrom.cc:
+     - use Dump() to generate the configuration output
+   * apt-pkg/depcache.cc:
+     - clearly separate 'positive' and 'negative' dependencies and
+       their upgrade-resolution tries in MarkInstall and especially don't
+       treat Conflicts differently compared to Breaks here
+     - provider is only a possible solution if the provides has the right
+       version (or none as we have no versioned provides in debian) and not
+       if the version of the provider matches
+   * edsp/edspsystem.cc:
+     - check with RealFileExists for scenario file as otherwise a directory
+       like one provided with RootDir triggers the usage of EDSP
+   * debian/libapt-inst1.5.symbols:
+     - use the correct library name the symbols header
+   * apt-pkg/pkgcachegen.cc:
+     - check if NewDescription allocation has failed and error out accordingly
+     - check if we work on a valid description in IsDuplicateDescription as
+       we end up working on dangling pointers otherwise which segfaults on
+       s390x and ppc64 (Closes: #669427)
+   * apt-pkg/deb/deblistparser.cc:
+     - check length and containing chars for a given description md5sum
+   * ensure that apti18n.h is included last as advertised (Closes: #671623)
+   * apt-pkg/acquire-worker.cc:
+     - revert the use of FileFd::Write in OutFdReady as we don't want error
+       reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito
+       for the report. (Closes: #671721)
+   * apt-pkg/contrib/fileutl.cc:
+     - check that the fd which are closed are valid
+     - ensure that we do init d only once and especially not with its own
+       content as this causes some "interesting" hickups resulting in segfaults
+       as it seems (Closes: #554387, #670979)
+     - collect zombie (de)compressor processes on reopen
+     - ensure that in error conditions the Fail flag is set
+     - ensure that d is set before accessing it
+   * apt-pkg/aptconfiguration.cc:
+     - use NULL instead of "" for no (un)compress parameters
+   * apt-pkg/algorithms.cc:
+     - factor out of ListUpdate a AcquireUpdate to be able to provide your
+       own pkgAcquire fetcher to the wrapper
+   * apt-inst/deb/debfile.h:
+     - readd 'md5.h' to the uncleaned header includes to make qapt build
+       against us again unchanged to unblock transition (Closes: #669163)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 11 May 2012 17:16:22 +0200
+ 
+ apt (0.9.2) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * 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)
+ 
+   [ David Kalnischkies ]
+    * apt-pkg/deb/deblistparser.cc:
+     - only treat the native apt as essential by default (Closes: #669377)
+   * apt-pkg/contrib/fileutl.cc:
+     - redirect stderr from compressors to /dev/null
+   * apt-pkg/aptconfiguration.cc:
+     - if the compressor is not installed, but we link against it's
+       library accept it as a CompressionType (Closes: #669328)
+   * apt-pkg/contrib/sha2_internal.cc:
+     - do not use the input data directly but memcpy it instead as
+       it could be unaligned as in the http-transport which causes
+       a sigbus error on sparc (Closes: #669061)
+   * apt-pkg/cacheset.cc:
+     - actually return to the fallback modifier if we have detected we
+       should for packagenames which look like modifiers (Closes: #669591)
+ 
+   [ Adam Conrad ]
+   * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
+ 
+   [ Thorsten Spindler ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - do not crash if (*I).Pkg is NULL (LP: #939867)
+ 
+   [ Malcolm Scott ]
+   * apt-pkg/packagemanager.cc:
+     - iterate over all pre-depends or-group member instead of looping
+       endlessly over the first member in SmartUnpack (LP: #985852)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 20 Apr 2012 11:26:16 +0200
+ 
+ apt (0.9.1) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - if pkgCacheFile::Generate is disabled in 'update' don't
+       remove the caches (and don't try to open them)
+   * apt-pkg/packagemanager.cc:
+     - init counter in SmartConfigure so that the loop-breaker isn't
+       triggered at random… (Closes: #669060)
+ 
+   [ Christian Perrier ]
+   * Fix typo in apt-get(8). Closes: #664833
+   * Replace "argument" by "paramètre" in French translation.
+     Merci, les Titeps!
+   * Drop hardcoded "en.html" suffix in apt-secure manpage.
+     Thanks to David Prevot.
+   
+  -- Michael Vogt <mvo@debian.org>  Tue, 17 Apr 2012 09:49:31 +0200
+ 
+ apt (0.9.0) unstable; urgency=low
+ 
+   * upload to debian/unstable
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 15:53:17 +0200
+ 
+ apt (0.9.0~exp1) experimental; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/packagemanager.cc:
+     - fix inconsistent clog/cout usage in the debug output
+     - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+       ordering code does not get into a endless loop when it flip-flops
+       between two states
+   * update libapt-inst1.4 to libapt-inst1.5 because of the cleanup 
+     performed
+   * prepare debian/unstable upload, if there are no issues with this
+     upload it will directly go into unstable as 0.9.0  
+ 
+   [ David Kalnischkies ]
+   * do not update po and pot files in the process of the build as this
+     causes timestamp changes for the mo files which therefore can't
+     be refcounted by dpkg for your M-A: same packages
+     (Closes: #659333, LP: #924628)
+   * apt-inst/database.{cc,h}, apt-inst/deb/dpkgdb.{cc,h}:
+     - drop instead of fix as it is only needed if you want to reimplement dpkg
+       and comes straight from the beginning of last decade (Closes: #663372)
+   * apt-inst/deb/debfile.cc:
+     - {Extract,Merge}Control() is another instance of "lets reimplement dpkg"
+       so shot of this code before someone ends up using this…
+   * debian/libapt-pkg4.12:
+     - update symbols file
+   * debian/apt-utils.install:
+     - ship the ftparchive, apt-extractemplates and apt-sortpkgs locales
+       in the apt-utils package instead of the apt package
+   * 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
+   * apt-pkg/acquire-worker.cc:
+     - check return of write() as gcc recommends
+   * apt-pkg/acquire.cc:
+     - check return of write() as gcc recommends
+   * apt-pkg/cdrom.cc:
+     - check return of chdir() and link() as gcc recommends
+   * apt-pkg/clean.cc:
+     - check return of chdir() as gcc recommends
+   * apt-pkg/contrib/netrc.cc:
+     - check return of asprintf() as gcc recommends
+   * methods/rred.cc:
+     - check return of writev() as gcc recommends
+   * methods/mirror.cc:
+     - check return of chdir() as gcc recommends
+   * apt-pkg/deb/dpkgpm.cc:
+     - check return of write() a gcc recommends
+   * apt-inst/deb/debfile.cc:
+     - check return of chdir() as gcc recommends
+   * apt-inst/deb/dpkgdb.cc:
+     - check return of chdir() as gcc recommends
+   * methods/makefile:
+     - do not link rred against libz anymore as FileFd handles all
+       this transparently now
+   * debian/control:
+     - bump Standards-Version to 3.9.3 (no changes needed)
+     - add libbz2-dev as new build-dependency
+     - remove the libz-dev alternative from zlib1g-dev build-dependency
+     - suggest xz-utils instead of bzip2 and lzma
+   * doc/apt-get.8.xml:
+     - typofix: respect → respecting, thanks Mike Erickson! (Closes: #664833)
+   * debian/rules:
+     - do not sed in configure.in to set the version-number
+   * prepare-release:
+     - add as a small script to lazy check and prepare releases
+   * doc/*:
+     - move the command synopsis out of each manpage into apt-verbatim.ent
+       as they are a hell to translate and just single out the parameters
+       which can be translated to apt.ent
+   * apt-pkg/aptconfiguration.cc:
+     - if present, prefer xz binary over lzma
+     - if we have zlib builtin insert add a dummy gzip compressor for FileFD
+     - do the same for bz2 builtin if available
+   * methods/bzip2.cc:
+     - remove it as the functionality for all compressors can be
+       provided by gzip.cc now with the usage of FileFD
+   * apt-pkg/contrib/fileutl.cc:
+     - use libz2 library for (de)compression instead of the bzip2 binary as
+       the first is a dependency of dpkg and the later just priority:optional
+       so we gain 'easier' access to bz2-compressed Translation files this way
+   * cmdline/apt-get.cc:
+     - print list of autoremoves in alphabetical order (Closes: #639008)
+ 
+   [ Bogdan Purcareata ]
+   * doc/apt-get.8.xml:
+     - add 'download' to the usage line (Closes: #649340)
+   * cmdline/apt-get.cc:
+     - distinguish information about 'apt-get autoremove' based on the
+       number of auto-removed packages both before and after the list
+       of packages (Closes: #665833)
+ 
+   [ Steve Langasek ]
+   * don't treat build-depends-indep as cross-build-dependencies; we should
+     always install the host arch versions.  LP: #968828.
+ 
+   [ Paolo Rotolo ]
+   * Fix string from automatic to automatically (LP: #967393).
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 12 Apr 2012 12:40:39 +0200
+ 
+ apt (0.8.16~exp13) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/acquire-item.cc:
+     - 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)
+     - add Debug::pkgAcqArchive::NoQueue to disable package downloading
+   * apt-pkg/deb/dpkgpm.cc:
+     - chroot if needed before dpkg --assert-multi-arch
+     - ensure that dpkg binary doesn't have the chroot-directory prefixed
+     - call dpkg --assert-multi-arch with execvp instead of execv
+     - save the universe by not printing messages about apport if a package
+       with this name is not installed (Closes: #619646)
+     - handle a SIGINT in all modes as a break after the currently running
+       dpkg transaction instead of ignoring it completely
+   * 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)
+     - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
+   * apt-pkg/aptconfiguration.cc:
+     - chroot if needed before calling dpkg --print-foreign-architectures
+     - ensure that architectures are not added multiple times
+   * cmdline/apt-mark.cc:
+     - detect if dpkg has multiarch support before calling --set-selections
+     - correctly ignore already (un)hold packages
+   * apt-pkg/cachefile.cc:
+     - clean up lost atomic cachefiles with 'clean' (Closes: #650513)
+   * apt-pkg/indexrecords.cc:
+     - do not create empty Entries as a sideeffect of Lookup()
+   * apt-pkg/acquire-item.cc:
+     - drop support for i18n/Index file (introduced in 0.8.11) and use
+       the Release file instead to get the Translations (Closes: #649314)
+     - use pdiff for Translation-* files if available (Closes: #657902)
+   * ftparchive/writer.cc:
+     - add 'Translation-*' to the default patterns
+   * cmdline/apt-get.cc:
+     - if a package can't be removed as it is not installed, suggest to
+       the user an (installed) multiarch silbing with 'Did you mean?'
+     - improve 'error' message for packages which are only referenced
+       e.g. in a Depends line and are now requested for removal
+   * cmdline/apt-cache.cc:
+     - correct --pre-depends option by using dash consistently (LP: #940837)
+   * 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/contrib/fileutl.cc:
+     - do not warn about the ignoring of directories (Closes: #662762)
+ 
+   [ Steve Langasek ]
+   * cmdline/apt-get.cc:
+     - for cross-build-dependencies M-A: none should be DEB_HOST_ARCH,
+       not DEB_BUILD_ARCH (Closes: #646288)
+ 
+   [ Colin Watson ]
+   * apt-pkg/algorithms.cc:
+     - don't break out of the main-resolver loop for Breaks to deal with all
+       of them in a single iteration (Closes: #657695, LP: #922485)
+     - use a signed int instead of short for score calculation as upgrades
+       become so big now that it can overflow (Closes: #657732, LP: #917173)
+   * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+     handle compressed files again (LP: #924182, closes: #658096)
+ 
+   [ Michael Vogt ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - fix crash when a package is in removed but residual config state
+       (LP: #923807)
+   * apt-pkg/contrib/fileutl.h:
+     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+   * apt-pkg/packagemanager.cc:
+     - fix bug in predepends handling - ensure that packages that needs
+       unpackaging are unpacked before they are configured (LP: #927993)
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/deb/deblistparser.cc:
+     - Set the Essential flag on APT instead of only Important
+   * apt-pkg/packagemanager.cc:
+     - Do not use immediate configuration for packages with the Important flag
+   * Treat the Important flag like the Essential flag with those differences:
+     - No Immediate configuration (see above)
+     - Not automatically installed during dist-upgrade
+     - No higher score for installation ordering
+ 
+  -- 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 ]
@@@ -201,6 -463,10 +622,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:
@@@ -234,8 -500,7 +659,8 @@@ apt (0.8.16~exp9) experimental; urgency
      - use Lists instead of Sets if input order should be preserved for
        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.
+     - 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
@@@ -665,10 -753,10 +1100,10 @@@ apt (0.8.15.10) unstable; urgency=hig
    * Polish (Michał Kułach). Closes: #656908
    * Danish (Joe Hansen). Closes: #658643
    * 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
diff --cc debian/control
index 841a35183,bb1bb9aae..93df24a3a
--- a/debian/control
+++ b/debian/control
@@@ -6,22 -5,22 +6,22 @@@ XSBC-Original-Maintainer: APT Developme
  Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Julian Andres Klode <jak@debian.org>
- Standards-Version: 3.9.2
+ 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),
 - zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
 - po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml
 -Build-Depends-Indep: doxygen
 + gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
 + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml,
 + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
  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
 +Pre-Depends: dpkg (>= 1.15.7.2)
 +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, bzip2, lzma, python-apt
+ Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
  Description: commandline package manager
   This package provides commandline tools for searching and
   managing as well as querying information about packages
diff --cc doc/po/apt-doc.pot
index fff943e35,af4018272..68da38ba0
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -1,13 -1,13 +1,14 @@@
  # SOME DESCRIPTIVE TITLE
  # Copyright (C) YEAR Free Software Foundation, Inc.
--# This file is distributed under the same license as the PACKAGE package.
++# This file is distributed under the same license as the apt package.
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
  #, fuzzy
  msgid ""
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
- "POT-Creation-Date: 2011-11-10 16:42+0100\n"
 -"POT-Creation-Date: 2012-05-21 13:37+0300\n"
++"Project-Id-Version: apt 0.9.5ubuntu1~20120522\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:59+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"
@@@ -3651,17 -2728,12 +2729,12 @@@ 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><term>
- #: apt-key.8.xml:141
- msgid "net-update"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:145
+ #: apt-key.8.xml:144
  msgid ""
  "Work similar to the <command>update</command> command above, but get the "
  "archive keyring from an URI instead and validate it against a master key.  "
@@@ -3710,23 -2777,23 +2778,23 @@@ msgid "Local trust database of archive 
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:184
+ #: 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:185
+ #: 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:188
+ #: 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:189
+ #: 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>
diff --cc doc/po/de.po
index 9a3415051,c7da79418..2b718b77d
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -7,8 -7,8 +7,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.8.15-9\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
- "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 -"POT-Creation-Date: 2012-05-21 13:37+0300\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
+ "PO-Revision-Date: 2012-05-21 23:18+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
  "Language: de\n"
@@@ -4787,16 -3737,19 +3737,26 @@@ msgstr "
  "öffentlichen Schlüssel herunterladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: 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 keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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><term>
- #: apt-key.8.xml:140
- msgid "net-update"
- msgstr "net-update"
+ "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
+ "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
+ "Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-"
+ "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
+ "<literal>debian-archive-keyring</literal> in Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -4872,35 -3806,35 +3813,44 @@@ msgid "<filename>/etc/apt/trustdb.gpg</
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
- msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
+ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
- msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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."
+ "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
diff --cc doc/po/es.po
index 35b8d0af7,c5611aff6..28d9e9135
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -36,7 -36,7 +36,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
  "PO-Revision-Date: 2010-08-25 03:25+0200\n"
  "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
  "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@@ -4814,20 -3800,14 +3801,14 @@@ msgstr "
  "«adv --recv-key»."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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 "
- "Debian, y elimina del registro las claves del archivo que ya no son válidas."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -4893,25 -3870,25 +3871,34 @@@ msgid "Local trust database of archive 
  msgstr "Base de datos local de las claves de confianza de archivos Debian"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/fr.po
index 6183ae072,5881fd38c..cf2b4bcf9
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
  "PO-Revision-Date: 2011-02-17 07:50+0100\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@@ -4756,20 -3784,14 +3785,14 @@@ msgstr "
  "possible de télécharger une clé publique."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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 Debian et supprimer les clés qui y sont périmées."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -4835,25 -3854,25 +3855,34 @@@ msgid "Local trust database of archive 
  msgstr "Base de données locale de fiabilité des clés de l'archive."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/it.po
index 4571690e1,e8e0d5e4e..4f2f266ab
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -3580,18 -2685,15 +2686,15 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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><term>
- #: apt-key.8.xml:140
- #, fuzzy
- msgid "net-update"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
@@@ -3640,24 -2739,24 +2740,24 @@@ msgid "Local trust database of archive 
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/ja.po
index 22488b227,dab4f0b02..c0d0d7953
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -7,7 -7,7 +7,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
  "PO-Revision-Date: 2010-09-07 07:38+0900\n"
  "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@@ -4918,22 -3850,15 +3851,15 @@@ msgstr "
  "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
  "できます。"
  
- # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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 ""
- "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー"
- "リングから削除します。"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -5001,27 -3922,27 +3923,36 @@@ msgid "Local trust database of archive 
  msgstr "アーカイブキーのローカル信頼データベースです。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/pl.po
index 41eb56684,b5c10af16..f30f24e23
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -10,7 -10,7 +10,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
  "PO-Revision-Date: 2010-03-18 22:00+0100\n"
  "Last-Translator: Robert Luberda <robert@debian.org>\n"
  "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@@ -4760,20 -3680,14 +3681,14 @@@ msgstr "
  "pobranie klucza publicznego."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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 "
- "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -4838,25 -3749,25 +3750,34 @@@ msgid "Local trust database of archive 
  msgstr "Lokalna składnica zaufanych kluczy archiwum."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/pt.po
index e298281f8,58e6ca5e2..4c04e78ef
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -6,7 -6,7 +6,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.8.0~pre1\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -4737,20 -3724,14 +3725,14 @@@ msgstr "
  "chave pública."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "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 o chaveiro local com o chaveiro das chaves de arquivos Debian e "
- "remove do chaveiro as chaves de arquivo que já não são válidas."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
@@@ -4816,25 -3794,25 +3795,34 @@@ msgid "Local trust database of archive 
  msgstr "Base de dados local de confiança de chaves de arquivos."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>
diff --cc doc/po/pt_BR.po
index 488350186,12eb7b0a0..db3d0b541
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -3636,15 -2740,13 +2741,13 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- msgid "net-update"
+ "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>
@@@ -3699,24 -2795,24 +2796,24 @@@ msgid "Local trust database of archive 
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: 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:182
- msgid "Keyring of Debian archive trusted keys."
+ #: 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:185
+ #: 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:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: 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>