From: Michael Vogt Date: Thu, 24 May 2012 18:55:52 +0000 (+0200) Subject: merged from debian X-Git-Tag: 0.9.13.exp1ubuntu1~68 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e83b322145fe7ab2f80a610dc821757e7221a528?hp=-c merged from debian --- e83b322145fe7ab2f80a610dc821757e7221a528 diff --combined debian/changelog index 4edc80ac3,c0cc77c29..5048dd9dd --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,4 +1,18 @@@ - apt (0.9.6) UNRELEASED; urgency=low ++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 ++ - patch for apt cross-building, see http://bugs.debian.org/666772 ++ ++ -- Michael Vogt Tue, 22 May 2012 15:57:26 +0200 ++ + apt (0.9.5.1) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/fileutl.cc: @@@ -13,22 -13,11 +27,11 @@@ * doc/*.xml: - remove 'GNU/Linux' from 'Debian systems' strings as Debian has more systems than just GNU/Linux nowadays + * doc/apt-cache.8.xml: + - fix a typo as well as adding missing literal markup + - three small rewordings for better english sentences - -- David Kalnischkies Tue, 22 May 2012 18:13:19 +0200 - - 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 - - patch for apt cross-building, see http://bugs.debian.org/666772 - - -- Michael Vogt Tue, 22 May 2012 15:57:26 +0200 + -- Michael Vogt Thu, 24 May 2012 17:16:34 +0200 apt (0.9.5) unstable; urgency=low @@@ -438,152 -427,6 +441,152 @@@ apt (0.8.16~exp13) experimental; urgenc -- Michael Vogt 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 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 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 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 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 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 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 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 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 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 Sun, 29 Jan 2012 00:44:16 +0000 + apt (0.8.16~exp12) experimental; urgency=low [ Michael Vogt ] @@@ -641,10 -484,10 +644,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: @@@ -679,7 -522,6 +682,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 @@@ -777,198 -619,15 +780,198 @@@ apt (0.8.16~exp6) experimental; urgency -- Michael Vogt 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 @@@ -1094,10 -753,6 +1097,10 @@@ apt (0.8.15.10) unstable; urgency=hig - show a debug why a package was kept by ResolveByKeep() * doc/manpage-style.xml: - put 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: @@@ -1121,8 -776,8 +1124,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 Tue, 06 Mar 2012 14:14:26 +0100 @@@ -1250,14 -905,6 +1253,14 @@@ apt (0.8.15.6) unstable; urgency=lo -- Michael Vogt 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 Mon, 01 Aug 2011 15:18:50 +0200 + apt (0.8.15.5) unstable; urgency=low [ David Kalnischkies ] @@@ -1266,28 -913,6 +1269,28 @@@ -- Michael Vogt 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 Fri, 29 Jul 2011 18:25:22 +0200 + +apt (0.8.15.4ubuntu1) oneiric; urgency=low + + * merged from debian-sid + + -- Michael Vogt Tue, 26 Jul 2011 13:19:49 +0200 + apt (0.8.15.4) unstable; urgency=low [ David Miller ] @@@ -1352,39 -977,6 +1355,39 @@@ apt (0.8.15.3) unstable; urgency=lo -- Michael Vogt Mon, 25 Jul 2011 15:04:43 +0200 +apt (0.8.15.2ubuntu2) oneiric; urgency=low + + * cmdline/apt-get.cc: + - fix missing download progress in apt-get download + + -- Michael Vogt Fri, 22 Jul 2011 13:20:49 +0200 + +apt (0.8.15.2ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - improve error message for a expired Release file + * apt-pkg/algorithms.cc: + - Hold back packages that would enter "policy-broken" state on upgrade + when doing a "apt-get upgrade" + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - fallback to memory if file is not writeable even if access() + told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) + * doc/sources.list.5.xml: + - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- Michael Vogt 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 @@@ -1392,36 -984,18 +1395,36 @@@ -- Michael Vogt Tue, 12 Jul 2011 11:54:47 +0200 -apt (0.8.15.1) unstable; urgency=low +apt (0.8.15.1ubuntu2) oneiric; 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) - * debian/apt.symbols: - - forgot 'mips' in the list for all architecture dependent symbols - - comment out gcc-4.5 specific symbols as gcc-4.6 is now default + [ 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 Wed, 13 Jul 2011 14:42:02 +0200 + +apt (0.8.15.1ubuntu1) oneiric; urgency=low + + * merge from debian/sid + + -- Michael Vogt 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) + * debian/apt.symbols: + - forgot 'mips' in the list for all architecture dependent symbols + - comment out gcc-4.5 specific symbols as gcc-4.6 is now default - the symbol for PrintStatus() is architecture dependent * apt-pkg/policy.cc: - do not segfault in pinning if a package with this name doesn't exist. @@@ -1433,17 -1007,6 +1436,17 @@@ -- Michael Vogt 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 Wed, 29 Jun 2011 09:03:39 +0100 + apt (0.8.15) unstable; urgency=low [ Julian Andres Klode ] @@@ -1732,101 -1295,6 +1735,101 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo -- Michael Vogt 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 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 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 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 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 Mon, 30 May 2011 17:12:27 +0200 + +apt (0.8.14.1ubuntu3) oneiric; urgency=low + + * Rebuild with recent binutils. LP: #774175. + + -- Matthias Klose 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 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 Fri, 29 Apr 2011 17:55:20 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: @@@ -1869,42 -1337,6 +1872,42 @@@ apt (0.8.14) unstable; urgency=lo -- Julian Andres Klode 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 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 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 Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] @@@ -1941,12 -1373,6 +1944,12 @@@ -- Michael Vogt 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 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 @@@ -1954,24 -1380,6 +1957,24 @@@ -- Julian Andres Klode 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 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 Wed, 16 Mar 2011 08:23:19 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] @@@ -1993,29 -1401,6 +1996,29 @@@ -- Michael Vogt 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 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 Thu, 10 Mar 2011 16:12:22 +0100 + apt (0.8.12) unstable; urgency=low [ Michael Vogt ] @@@ -2069,23 -1454,6 +2072,23 @@@ -- Michael Vogt 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 Thu, 03 Mar 2011 17:39:30 +0100 + +apt (0.8.11.5ubuntu1) natty; urgency=low + + * Merged from debian/sid + + -- Michael Vogt Fri, 18 Feb 2011 12:01:19 +0100 + apt (0.8.11.5) unstable; urgency=low [ Christian Perrier ] @@@ -2317,27 -1685,6 +2320,27 @@@ apt (0.8.10.1) unstable; urgency=lo -- Michael Vogt 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 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 Tue, 07 Dec 2010 15:53:49 +0100 + apt (0.8.10) unstable; urgency=low [ Programs translations ] @@@ -2357,48 -1704,6 +2360,48 @@@ -- Michael Vogt 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 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 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 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 Thu, 18 Nov 2010 15:02:14 +0100 + apt (0.8.9) unstable; urgency=low [ Christian Perrier ] @@@ -2430,47 -1735,6 +2433,47 @@@ -- Michael Vogt 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 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 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 Fri, 29 Oct 2010 10:07:09 -0400 + apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] @@@ -2490,17 -1754,6 +2493,17 @@@ -- Michael Vogt 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 Fri, 15 Oct 2010 18:31:17 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] @@@ -2619,147 -1872,61 +2622,147 @@@ apt (0.8.4) unstable; urgency=lo -- Michael Vogt 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 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 Tue, 07 Sep 2010 15:28:41 +0200 + -- Michael Vogt Fri, 01 Oct 2010 15:25:00 +0200 -apt (0.8.2) unstable; urgency=low +apt (0.8.3ubuntu5) maverick; urgency=low - [ Manpages translations ] - * Spanish (Omar Campagne). Closes: #595557 + * debian/apt.dirs: + - add missing /usr/share/apt so that the keyring is installed + into the right place (LP: #620576) - [ David Kalnischkies ] - * apt-pkg/versionmatch.cc: - - do not accept 'Pin: origin "' (missing closing ") as a valid - way to pin a local archive: either "" or none… - * apt-pkg/deb/dpkgpm.cc: - - create Dir::Log if needed to support /var/log as tmpfs or similar, - inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) - * apt-pkg/indexcopy.cc: - - support really still the APT::GPGV::TrustedKeyring setting, - as it breaks d-i badly otherwise (Closes: #595428) - * cmdline/apt-key: - - support also Dir::Etc::Trusted so that apt-key works in the same - way as the library part which works with the trusted files - * methods/{gzip,bzip2}.cc: - - empty files can never be valid archives (Closes: #595691) + -- Michael Vogt Wed, 22 Sep 2010 18:34:18 +0200 - -- Michael Vogt Mon, 06 Sep 2010 18:10:06 +0200 +apt (0.8.3ubuntu4) maverick; urgency=low -apt (0.8.1) unstable; urgency=low + * merged lp:~mvo/apt/conflicts-on-virtuals to better deal + with conflicts/breaks against virtual packages (LP: #614993) - [ 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 - * Simplified Chinese (Aron Xu). Closes: #594458 + -- Michael Vogt 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 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 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 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 Tue, 07 Sep 2010 15:28:41 +0200 + +apt (0.8.2) unstable; urgency=low + + [ Manpages translations ] + * Spanish (Omar Campagne). Closes: #595557 + + [ David Kalnischkies ] + * apt-pkg/versionmatch.cc: + - do not accept 'Pin: origin "' (missing closing ") as a valid + way to pin a local archive: either "" or none… + * apt-pkg/deb/dpkgpm.cc: + - create Dir::Log if needed to support /var/log as tmpfs or similar, + inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) + * apt-pkg/indexcopy.cc: + - support really still the APT::GPGV::TrustedKeyring setting, + as it breaks d-i badly otherwise (Closes: #595428) + * cmdline/apt-key: + - support also Dir::Etc::Trusted so that apt-key works in the same + way as the library part which works with the trusted files + * methods/{gzip,bzip2}.cc: + - empty files can never be valid archives (Closes: #595691) + + -- Michael Vogt Mon, 06 Sep 2010 18:10:06 +0200 + +apt (0.8.1) unstable; urgency=low + + [ 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 + * Simplified Chinese (Aron Xu). Closes: #594458 * Bulgarian (Damyan Ivanov). Closes: #594627 * Portuguese (Miguel Figueiredo). Closes: #594668 * Korean (Changwoo Ryu). Closes: #594809 @@@ -2797,69 -1964,6 +2800,69 @@@ -- Michael Vogt 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 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 Thu, 26 Aug 2010 18:56:23 +0200 + +apt (0.8.0ubuntu1) maverick; urgency=low + + * merged from debian/unstable + + -- Michael Vogt Tue, 24 Aug 2010 21:39:06 +0200 + apt (0.8.0) unstable; urgency=low [ Michael Vogt ] @@@ -2902,20 -2006,6 +2905,20 @@@ apt (0.8.0~pre2) experimental; urgency= -- Michael Vogt 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 Mon, 23 Aug 2010 13:53:09 +0200 + +apt (0.8.0~pre1ubuntu1) maverick; urgency=low + + * merged fixes from debian/experimental + + -- Michael Vogt Fri, 13 Aug 2010 17:49:40 +0200 + apt (0.8.0~pre1) experimental; urgency=low [ Programs translations ] @@@ -2958,56 -2048,6 +2961,56 @@@ -- Michael Vogt 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 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 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 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 Fri, 30 Jul 2010 19:32:15 +0200 + apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] @@@ -3622,233 -2662,87 +3625,233 @@@ apt (0.7.26~exp1) experimental; urgency -- Michael Vogt Thu, 18 Feb 2010 16:11:39 +0100 -apt (0.7.25.3) unstable; urgency=low +apt (0.7.25.3ubuntu10) maverick; urgency=low - [ Christian Perrier ] - * Italian translation update. Closes: #567532 + [ 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) - [ David Kalnischkies ] - * apt-pkg/contrib/macros.h: - - install the header system.h with a new name to be able to use - it in other headers (Closes: #567662) - * cmdline/acqprogress.cc: - - Set Mode to Medium so that the correct prefix is used. - Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) - * ftparchive/writer.cc: - - generate sha1 and sha256 checksums for dsc (Closes: #567343) - * cmdline/apt-get.cc: - - don't mark as manually if in download only (Closes: #468180) + [ Matthias G. ] + * apt-pkg/deb/dpkgpm.cc: + - Fix segmentation fault when /var/log/apt ist missing. LP: #535509 - -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 + -- Michael Vogt Thu, 08 Jul 2010 09:37:03 +0200 -apt (0.7.25.2) unstable; urgency=low +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low - [ Michael Vogt ] - * apt-pkg/contrib/cdromutl.cc: - - fix UnmountCdrom() fails, give it a bit more time and try - the umount again - * apt-pkg/cdrom.cc: - - fix crash in pkgUdevCdromDevices - * methods/cdrom.cc: - - fixes in multi cdrom setup code (closes: #549312) - - add new "Acquire::cdrom::AutoDetect" config that enables/disables - the dlopen of libudev for automatic cdrom detection. Off by default - currently, feedback/testing welcome - * cmdline/apt-cdrom.cc: - - add new --auto-detect option that uses libudev to figure out - the cdrom/mount-point - * cmdline/apt-mark: - - merge fix from Gene Cash that supports markauto for - packages that are not in the extended_states file yet - (closes: #534920) - * ftparchive/writer.{cc,h}: - - merge crash fix for apt-ftparchive on hurd, thanks to - Samuel Thibault for the patch (closes: #566664) + * debian/apt.postinst: + - do not fail if getent returns nothing useful (LP: #579647) + thanks to Jean-Baptiste Lallement - [ David Kalnischkies ] - * apt-pkg/contrib/fileutl.cc: - - Fix the newly introduced method GetListOfFilesInDir to not - accept every file if no extension is enforced - (= restore old behaviour). (Closes: #565213) - * apt-pkg/policy.cc: - - accept also partfiles with "pref" file extension as valid - * apt-pkg/contrib/configuration.cc: - - accept also partfiles with "conf" file extension as valid - * doc/apt.conf.5.xml: - - reorder description and split out syntax - - add partfile name convention (Closes: #558348) - * doc/apt_preferences.conf.5.xml: - - describe partfile name convention also here - * apt-pkg/deb/dpkgpm.cc: - - don't segfault if term.log file can't be opened. - Thanks Sam Brightman for the patch! (Closes: #475770) - * doc/*: - - replace the per language addendum with a global addendum - - add a explanation why translations include (maybe) english - parts to the new global addendum (Closes: #561636) - * apt-pkg/contrib/strutl.cc: - - fix malloc asseration fail with ja_JP.eucJP locale in - apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) + -- Michael Vogt Fri, 14 May 2010 09:40:50 +0200 - [ Christian Perrier ] - * French translation update +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low - -- Michael Vogt Wed, 27 Jan 2010 16:16:10 +0100 + [ Loïc Minier ] + * Use https:// in Vcs-Bzr URL. -apt (0.7.25.1) unstable; urgency=low + [ 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 - [ Christian Perrier ] - * French manpage translation update - * Russian translation update by Yuri Kozlov - Closes: #564171 + -- Michael Vogt Wed, 05 May 2010 10:33:46 +0200 - [Chris Leick] +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 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 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 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 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 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 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 Wed, 17 Feb 2010 23:33:32 +0100 + +apt (0.7.25.3) unstable; urgency=low + + [ Christian Perrier ] + * Italian translation update. Closes: #567532 + + [ David Kalnischkies ] + * apt-pkg/contrib/macros.h: + - install the header system.h with a new name to be able to use + it in other headers (Closes: #567662) + * cmdline/acqprogress.cc: + - Set Mode to Medium so that the correct prefix is used. + Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) + * ftparchive/writer.cc: + - generate sha1 and sha256 checksums for dsc (Closes: #567343) + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) + + -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 + +apt (0.7.25.2) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/contrib/cdromutl.cc: + - fix UnmountCdrom() fails, give it a bit more time and try + the umount again + * apt-pkg/cdrom.cc: + - fix crash in pkgUdevCdromDevices + * methods/cdrom.cc: + - fixes in multi cdrom setup code (closes: #549312) + - add new "Acquire::cdrom::AutoDetect" config that enables/disables + the dlopen of libudev for automatic cdrom detection. Off by default + currently, feedback/testing welcome + * cmdline/apt-cdrom.cc: + - add new --auto-detect option that uses libudev to figure out + the cdrom/mount-point + * cmdline/apt-mark: + - merge fix from Gene Cash that supports markauto for + packages that are not in the extended_states file yet + (closes: #534920) + * ftparchive/writer.{cc,h}: + - merge crash fix for apt-ftparchive on hurd, thanks to + Samuel Thibault for the patch (closes: #566664) + + [ David Kalnischkies ] + * apt-pkg/contrib/fileutl.cc: + - Fix the newly introduced method GetListOfFilesInDir to not + accept every file if no extension is enforced + (= restore old behaviour). (Closes: #565213) + * apt-pkg/policy.cc: + - accept also partfiles with "pref" file extension as valid + * apt-pkg/contrib/configuration.cc: + - accept also partfiles with "conf" file extension as valid + * doc/apt.conf.5.xml: + - reorder description and split out syntax + - add partfile name convention (Closes: #558348) + * doc/apt_preferences.conf.5.xml: + - describe partfile name convention also here + * apt-pkg/deb/dpkgpm.cc: + - don't segfault if term.log file can't be opened. + Thanks Sam Brightman for the patch! (Closes: #475770) + * doc/*: + - replace the per language addendum with a global addendum + - add a explanation why translations include (maybe) english + parts to the new global addendum (Closes: #561636) + * apt-pkg/contrib/strutl.cc: + - fix malloc asseration fail with ja_JP.eucJP locale in + apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) + + [ Christian Perrier ] + * French translation update + + -- Michael Vogt Wed, 27 Jan 2010 16:16:10 +0100 + +apt (0.7.25.1) unstable; urgency=low + + [ Christian Perrier ] + * French manpage translation update + * Russian translation update by Yuri Kozlov + Closes: #564171 + + [Chris Leick] * spot & fix various typos in all manpages * German manpage translation update @@@ -3888,39 -2782,6 +3891,39 @@@ -- Michael Vogt Sat, 09 Jan 2010 21:52:36 +0100 +apt (0.7.25ubuntu4) lucid; urgency=low + + * cmdline/apt-cdrom.cc: + - make Acquire::cdrom::AutoDetect default, this can be + turned off with "--no-auto-detect" + * methods/http.cc: + - add cache-control headers even if no cache is given to allow + adding options for intercepting proxies + + -- Michael Vogt 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 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 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 Tue, 22 Dec 2009 09:44:08 +0100 + apt (0.7.25) unstable; urgency=low [ Christian Perrier ] @@@ -4064,29 -2925,6 +4067,29 @@@ -- Michael Vogt 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 Mon, 14 Dec 2009 09:27:26 +0100 + apt (0.7.24) unstable; urgency=low [ Nicolas François ] @@@ -4156,59 -2994,6 +4159,59 @@@ -- Michael Vogt 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 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 Wed, 23 Sep 2009 18:15:10 +0200 + apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] @@@ -4438,34 -3223,6 +4441,34 @@@ apt (0.7.22) unstable; urgency=lo -- Michael Vogt 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 Tue, 09 Jun 2009 15:49:07 +0200 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] @@@ -4509,139 -3266,20 +4512,139 @@@ -- Michael Vogt Tue, 14 Apr 2009 14:12:51 +0200 -apt (0.7.20.2) unstable; urgency=medium +apt (0.7.20.2ubuntu7) karmic; urgency=low - [ Eugene V. Lyubimkin ] - * Urgency set to medium due to RC bug fix. - * doc/apt.ent, apt-get.8.xml: - - Fix invalid XML entities. (Closes: #514402) + * 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 - -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + -- Michael Vogt Fri, 24 Apr 2009 10:14:01 +0200 -apt (0.7.20.1) unstable; urgency=low +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 ] - * apt-pkg/pkgcachegen.cc: - - fix apt-cache search for localized description + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + LP: #356012 + + -- Michael Vogt 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 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 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 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 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 Mon, 09 Feb 2009 14:21:05 +0100 + +apt (0.7.20.2) unstable; urgency=medium + + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) + + -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + +apt (0.7.20.1) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description (closes: #512110) [ Christian Perrier ] @@@ -4696,12 -3334,6 +4699,12 @@@ apt (0.7.20) unstable; urgency=lo -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 +apt (0.7.19ubuntu1) jaunty; urgency=low + + * merge from debian + + -- Michael Vogt Mon, 24 Nov 2008 10:52:20 +0100 + apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] @@@ -5000,90 -3632,6 +5003,90 @@@ apt (0.7.15~exp1) experimental; urgency -- Michael Vogt 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 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 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 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 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 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 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 Fri, 09 May 2008 13:50:22 +0200 + apt (0.7.14) unstable; urgency=low [ Christian Perrier ] @@@ -5310,581 -3858,132 +5313,581 @@@ apt (0.7.10) unstable; urgency=lo -- Michael Vogt 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 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 - to add backward support for arches that lacks pselect support, - closes: #448406. - * Umount CD-ROM when calling apt-cdrom ident, except when called with - -m, closes: #448521. +apt (0.7.9ubuntu16) hardy; urgency=low - -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) -apt (0.7.8) unstable; urgency=low + -- Michael Vogt Tue, 08 Apr 2008 14:17:14 +0200 - * Applied patch from Daniel Leidert to fix - APT::Acquire::Translation "none" support, closes: #437523. - * Applied patch from Daniel Burrows to add support - for the Homepage field (ABI break), closes: #447970. - * Applied patch from Frans Pop to fix a trailing - space after cd label, closes: #448187. +apt (0.7.9ubuntu15) hardy; urgency=low - -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 + * 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) -apt (0.7.7) unstable; urgency=low + -- Michael Vogt Thu, 13 Mar 2008 23:25:45 +0100 - [ 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 - - 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) - - fix parse error when dpkg sends unexpected data - * 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 - * apt-pkg/acquire.cc: - - increase MaxPipeDepth for the internal worker<->method - communication to 1000 for the debtorrent backend - * 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 - * apt-pkg/acquire-item.cc: - - fix crash in diff acquire code - * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file (LP: #140019) - (thanks to Laurent Bigonville) - * apt-pkg/depcache.cc: - - set "APT::Install-Recommends" to true by default (OMG!) - * debian/apt.cron.daily: - - only run the cron job if apt-get check succeeds (LP: #131719) - - [ Program translations ] - - French updated - - Basque updated. Closes: #436425 - - Fix the zh_CN translator's name in debian/changelog for 0.7.2 - Closes: #423272 - - Vietnamese updated. Closes: #440611 - - Danish updated. Closes: #441102 - - Thai added. Closes: #442833 - - Swedish updated. - - Galician updated. Closes: #446626 +apt (0.7.9ubuntu14) hardy; urgency=low - [ Otavio Salvador ] - * Add hash support to copy method. Thanks Anders Kaseorg by the patch - (closes: #436055) - * Reset curl options and timestamp between downloaded files. Thanks to - Ryan Murray for the patch (closes: #437150) - * Add support to apt-key to export keys to stdout. Thanks to "Dwayne - C. Litzenberger" for the patch (closes: #441942) - * Fix compilation warnings: - - apt-pkg/indexfile.cc: conversion from string constant to 'char*'; - - apt-pkg/acquire-item.cc: likewise; - - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument - has type 'size_t'; - - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from - string constant to 'char*'; - - methods/gpgv.cc: conversion from string constant to 'char*'; - - methods/ftp.cc: likewise; - - cmdline/apt-extracttemplates.cc: likewise; - - apt-pkg/deb/debmetaindex.cc: comparison with string literal results - in unspecified behaviour; - * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage - statement of apt-get (closes: #445468). - * cmdline/apt-get.cc: really applies Julien Danjou - patch to add 'purge' command line argument (closes: #133421). + * 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) - [ Ian Jackson ] - * dpkg-triggers: Deal properly with new package states. + -- Michael Vogt Tue, 11 Mar 2008 21:46:07 +0100 - [ Colin Watson ] - * apt-pkg/contrib/mmap.cc: - - don't fail if msync() returns > 0 - - -- Michael Vogt Tue, 23 Oct 2007 14:58:03 +0200 +apt (0.7.9ubuntu13) hardy; urgency=low -apt (0.7.6) unstable; 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 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 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 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 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 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 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 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 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 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 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 Mon, 07 Jan 2008 19:02:11 +0100 + +apt (0.7.9ubuntu2) hardy; urgency=low + + [ Otavio Salvador ] + * Applied patch from Aurelien Jarno to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut 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 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 to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno 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 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 + to add backward support for arches that lacks pselect support, + closes: #448406. + * Umount CD-ROM when calling apt-cdrom ident, except when called with + -m, closes: #448521. + + -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 + +apt (0.7.8) unstable; urgency=low + + * Applied patch from Daniel Leidert to fix + APT::Acquire::Translation "none" support, closes: #437523. + * Applied patch from Daniel Burrows to add support + for the Homepage field (ABI break), closes: #447970. + * Applied patch from Frans Pop to fix a trailing + space after cd label, closes: #448187. + + -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 + +apt (0.7.7) unstable; 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 + - 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) + - fix parse error when dpkg sends unexpected data + * 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 + * apt-pkg/acquire.cc: + - increase MaxPipeDepth for the internal worker<->method + communication to 1000 for the debtorrent backend + * 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 + * apt-pkg/acquire-item.cc: + - fix crash in diff acquire code + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + * apt-pkg/depcache.cc: + - set "APT::Install-Recommends" to true by default (OMG!) + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Program translations ] + - French updated + - Basque updated. Closes: #436425 + - Fix the zh_CN translator's name in debian/changelog for 0.7.2 + Closes: #423272 + - Vietnamese updated. Closes: #440611 + - Danish updated. Closes: #441102 + - Thai added. Closes: #442833 + - Swedish updated. + - Galician updated. Closes: #446626 + + [ Otavio Salvador ] + * Add hash support to copy method. Thanks Anders Kaseorg by the patch + (closes: #436055) + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray for the patch (closes: #437150) + * Add support to apt-key to export keys to stdout. Thanks to "Dwayne + C. Litzenberger" for the patch (closes: #441942) + * Fix compilation warnings: + - apt-pkg/indexfile.cc: conversion from string constant to 'char*'; + - apt-pkg/acquire-item.cc: likewise; + - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument + has type 'size_t'; + - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from + string constant to 'char*'; + - methods/gpgv.cc: conversion from string constant to 'char*'; + - methods/ftp.cc: likewise; + - cmdline/apt-extracttemplates.cc: likewise; + - apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; + * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage + statement of apt-get (closes: #445468). + * cmdline/apt-get.cc: really applies Julien Danjou + patch to add 'purge' command line argument (closes: #133421). + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + [ Colin Watson ] + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 + + -- Michael Vogt 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 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 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 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 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 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 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 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 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 Wed, 05 Sep 2007 15:03:46 +0200 + +apt (0.7.6ubuntu7) gutsy; urgency=low + + * reupload to fix FTBFS + + -- Michael Vogt 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 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 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 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 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 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 Thu, 02 Aug 2007 11:55:54 +0200 + +apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno to fix wrong directory downloading on non-linux architectures (closes: #435597) @@@ -5911,14 -4010,6 +5914,14 @@@ apt (0.7.5) unstable; urgency=lo -- Otavio Salvador 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 Thu, 26 Jul 2007 10:42:29 +0200 + apt (0.7.4) unstable; urgency=low [ Michael Vogt ] @@@ -5979,90 -4070,6 +5982,90 @@@ apt (0.7.3) unstable; urgency=lo -- Michael Vogt 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 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 Mon, 09 Jul 2007 01:15:57 +1000 + +apt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia Fri, 06 Jul 2007 19:17:33 +0200 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik 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 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 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 Thu, 14 Jun 2007 10:38:36 +0200 + apt (0.7.2-0.1) unstable; urgency=low * Non-maintainer upload. @@@ -6156,144 -4163,34 +6159,144 @@@ apt (0.7.1) experimental; urgency=lo * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) - -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + -- Michael Vogt 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 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 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 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 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 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 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 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 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 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 Fri, 12 Jan 2007 20:48:07 +0100 + -- Michael Vogt Thu, 7 Dec 2006 23:07:24 +0100 + +apt (0.6.46.4ubuntu1) feisty; urgency=low + + * merged with debian + + -- Michael Vogt Thu, 7 Dec 2006 12:13:14 +0100 apt (0.6.46.4-0.1) unstable; urgency=emergency @@@ -6324,26 -4221,6 +6327,26 @@@ apt (0.6.46.4) unstable; urgency=hig -- Michael Vogt 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 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á%Gč%@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 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. @@@ -6456,173 -4333,6 +6459,173 @@@ apt (0.6.46) unstable; urgency=lo -- Michael Vogt 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 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 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 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 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 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 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 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 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 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 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 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 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 Wed, 9 Aug 2006 23:38:46 +0200 + +apt (0.6.45ubuntu1) edgy; urgency=low + + * merged with debian/unstable + + -- Michael Vogt Tue, 1 Aug 2006 15:43:22 +0200 + apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: @@@ -6668,37 -4378,6 +6671,37 @@@ -- Michael Vogt 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 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 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 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 Mon, 3 Jul 2006 18:30:46 +0200 + apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions @@@ -6787,26 -4466,6 +6790,26 @@@ apt (0.6.44) unstable; urgency=lo -- Michael Vogt 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 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 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 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: @@@ -6839,38 -4498,6 +6842,38 @@@ -- Michael Vogt 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 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: @@@ -6894,24 -4521,6 +6897,24 @@@ -- Michael Vogt 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 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: @@@ -6935,19 -4544,6 +6938,19 @@@ -- Michael Vogt 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 Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt 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: @@@ -6968,22 -4564,6 +6971,22 @@@ -- Michael Vogt 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 Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt 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: @@@ -7090,80 -4670,6 +7093,80 @@@ apt (0.6.41) unstable; urgency=lo -- Michael Vogt 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 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 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 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 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 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 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 Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt 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 @@@ -7173,12 -4679,6 +7176,12 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman 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 @@@ -7194,39 -4694,6 +7197,39 @@@ -- Matt Zimmerman 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 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 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 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 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 @@@ -7239,13 -4706,6 +7242,13 @@@ -- Matt Zimmerman 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 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 doc/po/apt-doc.pot index 688ef1e19,a723feb8e..3df08abb0 --- a/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.5\n" + "Project-Id-Version: apt-doc 0.9.5.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2012-05-24 15:04+0300\n" + "POT-Creation-Date: 2012-05-24 17:24+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -762,9 -762,9 +762,9 @@@ msgstr " msgid "" "Total distinct versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" #. type: Content of: @@@ -779,7 -779,7 +779,7 @@@ msgstr " msgid "" "showsrc displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" #. type: Content of: @@@ -890,9 -890,9 +890,9 @@@ msgstr " #: apt-cache.8.xml:216 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" #. type: Content of: @@@ -969,13 -969,13 +969,13 @@@ msgstr " #. type: Content of: #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "APT::Cache::Important." + "Print only important dependencies; for use with unmet and " + "depends. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: APT::Cache::Important." msgstr "" #. type: Content of: - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the depends and rdepends " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -985,25 -985,25 +985,25 @@@ msgstr "" #. type: Content of: - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "APT::Cache::ShowFull." msgstr "" #. type: Content of: - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use . If " " is specified, only the candidate version " - "will displayed (the one which would be selected for installation). This " + "will be displayed (the one which would be selected for installation). This " "option is only applicable to the show command. " "Configuration Item: APT::Cache::AllVersions." msgstr "" #. type: Content of: - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use " @@@ -1012,14 -1012,14 +1012,14 @@@ msgstr "" #. type: Content of: - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: APT::Cache::NamesOnly." msgstr "" #. type: Content of: - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make pkgnames print all names, including virtual packages " "and missing dependencies. Configuration Item: " @@@ -1027,7 -1027,7 +1027,7 @@@ msgstr "" #. type: Content of: - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make depends and rdepends recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1035,7 -1035,7 +1035,7 @@@ msgstr "" #. type: Content of: - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of depends and " "rdepends to packages which are currently installed. " @@@ -1043,27 -1043,27 +1043,27 @@@ msgstr "" #. type: Content of: - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2694,8 -2694,8 +2694,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> @@@ -2739,22 -2739,22 +2739,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> diff --combined doc/po/de.po index ff7f3c661,bf582cbdb..8c8feea96 --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-doc 0.9.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" - "POT-Creation-Date: 2012-05-23 01:20+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -907,9 -907,9 +907,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>Pure virtual packages</literal> ist die Anzahl der Pakete, die nur " "als ein virtueller Paketname existieren. Das kommt vor, wenn Pakete nur den " @@@ -923,8 -923,8 +923,8 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>Single virtual packages</literal> ist die Anzahl der Pakete mit nur " "einem Paket, das ein bestimmtes virtuelles Paket bereitstellt. »X11-text-" @@@ -936,8 -936,8 +936,8 @@@ msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>Mixed virtual packages</literal> ist die Anzahl der Pakete, die " "entweder ein bestimmtes virtuelles Paket bereitstellen oder den virtuellen " @@@ -962,12 -962,19 +962,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>Total distinct</literal> Versionen ist die Anzahl der im " "Zwischenspeicher gefundenen Paketversionen. Dieser Wert ist daher meistens " @@@ -987,10 -994,15 +994,15 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> zeigt alle Quellpaketdatensätze, die den " "angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, " @@@ -1052,14 -1064,13 +1064,13 @@@ msgid " "description is not searched, only the package name is." msgstr "" "<literal>search</literal> führt eine Volltextsuche in der Liste aller " - "verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe " - "®ex;. Es durchsucht die Paketnamen und " - "die Beschreibungen nach einem Vorkommen des regulären Ausdrucks und gibt den " - "Paketnamen mit einer kurzen Beschreibung, einschließlich virtueller " - "Paketnamen, aus. Wenn <option>--full</option> angegeben wurde, ist die " - "Ausgabe gleich der, die <literal>show</literal> für jedes Paket erzeugt und " - "wenn <option>--names-only</option> angegeben wurde, wird die lange " - "Beschreibung nicht durchsucht, sondern nur der Paketname." + "verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe ®ex;. " + "Es durchsucht die Paketnamen und die Beschreibungen nach einem Vorkommen des " + "regulären Ausdrucks und gibt den Paketnamen mit einer kurzen Beschreibung, " + "einschließlich virtueller Paketnamen, aus. Wenn <option>--full</option> " + "angegeben wurde, ist die Ausgabe gleich der, die <literal>show</literal> für " + "jedes Paket erzeugt und wenn <option>--names-only</option> angegeben wurde, " + "wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:181 @@@ -1144,11 -1155,17 +1155,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "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, reine Bereitstellungen sind Dreiecke, gemischte Bereitstellungen " @@@ -1263,16 -1280,17 +1280,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" - "nur wichtige Abhängigkeiten ausgeben. Zur Benutzung mit unmet und depends. " - "Veranlasst, dass nur Depends- und Pre-Depends-Beziehungen ausgegeben werden. " - "Konfigurationselement: <literal>APT::Cache::Important</literal>." + "nur wichtige Abhängigkeiten ausgeben. Zur Benutzung mit <literal>unmet</" + "literal> und <literal>depends</literal>. Veranlasst, dass nur Depends- und " + "Pre-Depends-Beziehungen ausgegeben werden. Konfigurationselement: " + "<literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -1288,7 -1306,7 +1306,7 @@@ msgstr " "Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1297,11 -1315,11 +1315,11 @@@ msgstr " "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1314,7 -1332,7 +1332,7 @@@ msgstr " "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1326,7 -1344,7 +1344,7 @@@ msgstr " "Konfigurationselement: <literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1335,7 -1353,7 +1353,7 @@@ msgstr " "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1346,7 -1364,7 +1364,7 @@@ msgstr " "<literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1357,7 -1375,7 +1375,7 @@@ msgstr " "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1368,13 -1386,13 +1386,13 @@@ msgstr " "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1383,19 -1401,19 +1401,19 @@@ msgid "See Also msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2835,15 -2853,15 +2853,15 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "<literal>install</literal> wird gefolgt von einem oder mehreren gewünschten " "Paketen zur Installation oder zum Upgrade. Jedes Paket ist ein Paketname, " @@@ -3692,19 -3710,12 +3710,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 " @@@ -3768,33 -3779,24 +3786,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" @@@ -3925,10 -3927,9 +3943,9 @@@ msgid " "Configuration Item: <literal>Dir::State</literal>." msgstr "" "schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter " - "&synopsis-param-filename;, anstatt " - "vom Standardort, der <filename>extended_status</filename> im von " - "Konfigurationselement <literal>Dir::State</literal> definierten Verzeichnis, " - "ist." + "&synopsis-param-filename;, anstatt vom Standardort, der " + "<filename>extended_status</filename> im von Konfigurationselement " + "<literal>Dir::State</literal> definierten Verzeichnis, ist." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:136 @@@ -7279,17 -7280,17 +7296,17 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" "benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur " - "Debian-Release-Version 3.0 gehören. Beachten Sie, dass es " - "normalerweise keine Versionsnummer für <literal>testing</literal>- und " - "<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht " - "veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde " - "eine der folgenden Zeilen benötigen:" + "Debian-Release-Version 3.0 gehören. Beachten Sie, dass es normalerweise " + "keine Versionsnummer für <literal>testing</literal>- und <literal>unstable</" + "literal>-Distributionen gibt, weil sie noch nicht veröffentlicht wurden. " + "Diese in der APT-Einstellungsdatei anzugeben würde eine der folgenden Zeilen " + "benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml:471 @@@ -7720,8 -7721,8 +7737,8 @@@ msgstr "Paketressourcenliste für APT msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, " "das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese " @@@ -8283,8 -8284,8 +8300,8 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-" "licenses/GPL, die die vollständige Lizenz enthält." diff --combined doc/po/es.po index 441f0ae5c,96075a0c0..1fd3c0827 --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -37,7 -37,7 +37,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.7.25\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" - "POT-Creation-Date: 2012-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -964,9 -964,9 +964,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>Paquetes virtuales puros</literal> es el número de paquetes que " "existen sólo como nombre de un paquete virtual, esto es, paquetes que sólo " @@@ -981,27 -981,27 +981,27 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>Paquetes virtuales únicos</literal> es el número de paquetes con un " "único paquete que proporciona un paquete virtual en concreto. Por ejemplo, " - "en un sistema Debian, «X11-text-viewer» es un paquete virtual, " - "pero sólo un paquete, xless, proporciona «X11-text-viewer»." + "en un sistema Debian, «X11-text-viewer» es un paquete virtual, pero sólo un " + "paquete, xless, proporciona «X11-text-viewer»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>Paquetes virtuales mixtos</literal> es el número de paquetes que o " "bien proporcionan un determinado paquete virtual o tienen el mismo nombre " "como paquete virtual y como paquete normal. Por ejemplo, en un sistema " - "Debian debconf es a la vez un paquete normal, y lo proporciona el " - "paquete debconf-tiny." + "Debian debconf es a la vez un paquete normal, y lo proporciona el paquete " + "debconf-tiny." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:121 @@@ -1021,12 -1021,19 +1021,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>Total de versiones distintas</literal> es el número de versiones de " "paquetes encontradas en la caché, por lo tanto el número es al menos igual " @@@ -1045,10 -1052,15 +1052,15 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> muestra todos los campos de los paquetes fuente " "que coinciden con los nombres de los paquetes proporcionados. Se muestran " @@@ -1213,11 -1225,17 +1225,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" "Los nodos resultantes tendrán varias formas: los paquetes normales son " "cajas, los paquetes virtuales puros son triángulos, los paquetes virtuales " @@@ -1328,16 -1346,17 +1346,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" - "Muestra sólo las dependencias importantes, se usa junto con unmet y depends. " - "Hace que sólo se muestren las dependencias y pre-dependencias. Opción de " - "configuración: <literal>APT::Cache::Important</literal>." + "Muestra sólo las dependencias importantes, se usa junto con <literal>unmet</" + "literal> y <literal>depends</literal>. Hace que sólo se muestren las " + "dependencias y pre-dependencias. Opción de configuración: <literal>APT::" + "Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -1353,7 -1372,7 +1372,7 @@@ msgstr " "<literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1362,11 -1381,11 +1381,11 @@@ msgstr " "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1379,7 -1398,7 +1398,7 @@@ msgstr " "configuración: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1391,7 -1410,7 +1410,7 @@@ msgstr " "Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1400,7 -1419,7 +1419,7 @@@ msgstr " "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1411,7 -1430,7 +1430,7 @@@ msgstr " "configuración: <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1422,7 -1441,7 +1441,7 @@@ msgstr " "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1433,13 -1452,13 +1452,13 @@@ msgstr " "Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1448,19 -1467,19 +1467,19 @@@ msgid "See Also msgstr "Véase también" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnósticos" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2888,15 -2907,15 +2907,15 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "<literal>install</literal> instala o actualiza los paquetes que siguen a la " "palabra «install». Cada paquete es un nombre de paquete, y no el nombre " @@@ -3749,8 -3768,8 +3768,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> @@@ -3802,33 -3821,24 +3821,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> @@@ -7375,15 -7385,15 +7394,15 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" "nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol " - "pueden pertenecer a la versión 3.0 de Debian. Observe que, " - "generalmente, <literal>testing</literal> y <literal>unstable</literal> no " - "tienen una versión asignada porque no se han publicado. Para especificar una " + "pueden pertenecer a la versión 3.0 de Debian. Observe que, generalmente, " + "<literal>testing</literal> y <literal>unstable</literal> no tienen una " + "versión asignada porque no se han publicado. Para especificar una " "preferencia de acuerdo con este parámetro tendrá que poner una de las " "siguientes línea en el fichero de preferencias de APT:" @@@ -7816,14 -7826,14 +7835,14 @@@ msgstr "Lista de los repositorios de pa msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "La lista de los repositorios de paquetes se usa para ubicar los archivos de " "Debian del sistema de distribución de paquetes en uso en el sistema. A día " "de hoy, esta página del manual documenta sólo el sistema de paquetes que usa " - "Debian. Este fichero de control está ubicado en <filename>/etc/apt/" - "sources.list</filename>" + "Debian. Este fichero de control está ubicado en <filename>/etc/apt/sources." + "list</filename>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:42 @@@ -8382,11 -8392,11 +8401,11 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" - "Para más detalles acerca de sistemas Debian y la licencia " - "completa, consulte el fichero «/usr/share/common-licenses/GPL»." + "Para más detalles acerca de sistemas Debian y la licencia completa, consulte " + "el fichero «/usr/share/common-licenses/GPL»." #. type: <heading></heading> #: guide.sgml:32 diff --combined doc/po/fr.po index 28411af59,9494231a7..1e12cc0ec --- a/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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -916,9 -916,9 +916,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>Pure virtual packages</literal> est le nombre de paquets qui " "n'existent que sous la forme d'un nom représentant un paquet virtuel ; ces " @@@ -933,26 -933,26 +933,26 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>Single virtual packages</literal> est le nombre de paquets virtuels " "qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du " - "système Debian, « X11-text-viewer » est un paquet virtuel ; seul " - "le paquet « xless » remplit « X11-text-viewer »." + "système Debian, « X11-text-viewer » est un paquet virtuel ; seul le paquet " + "« xless » remplit « X11-text-viewer »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>Mixed virtual packages</literal> est le nombre de paquets qui " "remplissent un paquet virtuel particulier ou dont le nom est un nom de " - "paquet virtuel. Par exemple, au sein du système Debian, " - "« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »." + "paquet virtuel. Par exemple, au sein du système Debian, « debconf » est un " + "paquet réel et il est aussi fourni par « debconf-tiny »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:121 @@@ -971,12 -971,19 +971,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>Total distinct versions</literal> est le nombre de versions de " "paquets trouvées dans le cache ; cette valeur est par conséquent au moins " @@@ -995,10 -1002,15 +1002,15 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> affiche toutes les entrées de paquets source qui " "correspondent aux noms donnés. Toutes les versions sont affichées et toutes " @@@ -1163,11 -1175,17 +1175,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" "Les noeuds résultants ont plusieurs formes ; les paquets normaux sont des " "boîtes, les « provides » purs sont des triangles, les « provides » mixtes " @@@ -1283,16 -1301,17 +1301,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" "N'affiche que les dépendances importantes ; à utiliser avec les commandes " - "unmet et depends pour n'afficher que les relations Depends et Pre-Depends. " - "Élément de configuration : <literal>APT::Cache::Important</literal>." + "<literal>unmet</literal> et <literal>depends</literal> pour n'afficher que " + "les relations Depends et Pre-Depends. Élément de configuration : " + "<literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -1307,7 -1326,7 +1326,7 @@@ msgstr " "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1317,11 -1336,11 +1336,11 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1335,7 -1354,7 +1354,7 @@@ msgstr " "<literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1347,7 -1366,7 +1366,7 @@@ msgstr " "configuration : <literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1357,7 -1376,7 +1376,7 @@@ msgstr " "NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1368,7 -1387,7 +1387,7 @@@ msgstr " "configuration : <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1380,7 -1399,7 +1399,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1391,13 -1410,13 +1410,13 @@@ msgstr " "Élément de configuration : <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1406,19 -1425,19 +1425,19 @@@ msgid "See Also msgstr "Voir aussi" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnostics" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2850,28 -2869,27 +2869,27 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "La commande <literal>install</literal> est suivie par un ou plusieurs " "paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un " - "nom complet de fichier (par exemple, dans un système Debian, on " - "indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les " - "paquets requis par le(s) paquet(s) que l'on veut installer sont aussi " - "récupérés et installés. Le fichier <filename>/etc/apt/sources.list</" - "filename> est utilisé pour retrouver les paquets désirés. Quand un trait " - "d'union est accolé (sans espace intermédiaire) au nom d'un paquet déjà " - "installé, ce paquet est supprimé. De même on peut ajouter un signe « + » " - "pour désigner un paquet à installer. Cette dernière fonctionnalité peut " - "être utilisée pour annuler les décisions prises par le système de résolution " - "des conflits d'apt-get." + "nom complet de fichier (par exemple, dans un système Debian, on indiquera " + "libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les paquets " + "requis par le(s) paquet(s) que l'on veut installer sont aussi récupérés et " + "installés. Le fichier <filename>/etc/apt/sources.list</filename> est utilisé " + "pour retrouver les paquets désirés. Quand un trait d'union est accolé (sans " + "espace intermédiaire) au nom d'un paquet déjà installé, ce paquet est " + "supprimé. De même on peut ajouter un signe « + » pour désigner un paquet à " + "installer. Cette dernière fonctionnalité peut être utilisée pour annuler " + "les décisions prises par le système de résolution des conflits d'apt-get." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:116 @@@ -3721,8 -3739,8 +3739,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> @@@ -3774,33 -3792,24 +3792,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> @@@ -7343,17 -7352,17 +7361,17 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" "indique la version de la distribution. Par exemple, les paquets dans les " - "répertoires peuvent appartenir à la distribution Debian version " - "3.0. Il n'y a pas de numéro de version pour les distributions " - "<literal>testing</literal> et <literal>unstable</literal> car elles n'ont " - "pas encore été publiées. Indiquer cette valeur dans le fichier des " - "préférences demanderait ces lignes :" + "répertoires peuvent appartenir à la distribution Debian version 3.0. Il n'y " + "a pas de numéro de version pour les distributions <literal>testing</literal> " + "et <literal>unstable</literal> car elles n'ont pas encore été publiées. " + "Indiquer cette valeur dans le fichier des préférences demanderait ces " + "lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml:471 @@@ -7778,8 -7787,8 +7796,8 @@@ msgstr "Liste des sources de paquets msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "La liste des sources de paquets indique où trouver les archives du système " "de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne " @@@ -8315,8 -8324,8 +8333,8 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" "Les détails complets de cette licence sont, sur les systèmes Debian GNU/" "Linux, consultables dans le fichier usr/share/common-licenses/GPL." diff --combined doc/po/it.po index 8c2ee778e,d1f0fc289..da49b5a6a --- a/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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -695,9 -695,9 +695,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -705,8 -705,8 +705,8 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -714,8 -714,8 +714,8 @@@ msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -733,9 -733,9 +733,9 @@@ msgstr " msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -750,7 -750,7 +750,7 @@@ msgstr " msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -860,9 -860,9 +860,9 @@@ msgstr " #: apt-cache.8.xml:216 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -940,13 -940,13 +940,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -956,25 -956,25 +956,25 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -982,14 -982,14 +982,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -997,7 -997,7 +997,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1005,7 -1005,7 +1005,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1013,13 -1013,13 +1013,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1028,19 -1028,19 +1028,19 @@@ msgid "See Also msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2082,15 -2082,15 +2082,15 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -2656,8 -2656,8 +2656,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> @@@ -2701,23 -2701,23 +2701,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> @@@ -5091,8 -5091,8 +5091,8 @@@ msgstr " #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" @@@ -5402,8 -5402,8 +5402,8 @@@ msgstr " msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> @@@ -5811,11 -5811,11 +5811,11 @@@ msgstr " #: guide.sgml:24 offline.sgml:25 #, fuzzy msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" - "Per ulteriori dettagli sui sistemi si veda il testo completo della " - "licenza nel file /usr/share/common-licenses/GPL." + "Per ulteriori dettagli sui sistemi si veda il testo completo della licenza " + "nel file /usr/share/common-licenses/GPL." #. type: <heading></heading> #: guide.sgml:32 diff --combined doc/po/ja.po index 885e52608,b46ec4dd0..f196caac6 --- a/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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -952,16 -952,16 +952,16 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する" "パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ" - "の名称を持たない) の数を表します。例えば、Debian システムでは " - "\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" " - "を提供するパッケージはいくつもありますが、\"mail-transport-agent\" という名称" - "のパッケージはありません。" + "の名称を持たない) の数を表します。例えば、Debian システムでは \"mail-" + "transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" を提供す" + "るパッケージはいくつもありますが、\"mail-transport-agent\" という名称のパッ" + "ケージはありません。" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -969,13 -969,13 +969,13 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ" - "ケージが、ただ一つの場合の数を表します。例えば、Debian システムで" - "は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す" - "るパッケージは、xless パッケージのみということです。" + "ケージが、ただ一つの場合の数を表します。例えば、Debian システムでは、\"X11-" + "text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供するパッケー" + "ジは、xless パッケージのみということです。" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -983,13 -983,13 +983,13 @@@ msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>複合仮想パッケージ</literal>は、その仮想パッケージ名を提供するパッ" "ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数" - "を表します。例えば、Debian システムでは、debconf は実際のパッケージ" - "名でもありますが、debconf-tiny によって提供もされています。" + "を表します。例えば、Debian システムでは、debconf は実際のパッケージ名でもあり" + "ますが、debconf-tiny によって提供もされています。" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -1010,12 -1010,19 +1010,19 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー" "ジョンの数を表します。そのため、この値は最小でもパッケージ名総数と一致しま" @@@ -1035,10 -1042,15 +1042,15 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ" "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す" @@@ -1206,11 -1218,17 +1218,17 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" "結果のノードは数種の形状をとります。通常パッケージは四角、純粋仮想パッケージ" "は三角、複合仮想パッケージは菱形、六角形は欠落パッケージをそれぞれ表します。" @@@ -1324,17 -1342,17 +1342,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" - "「重要」依存関係のみ表示 - unmet や depends と共に使用します。これは「依存」" - "関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::" - "Cache::Important</literal>" + "「重要」依存関係のみ表示 - <literal>unmet</literal> や <literal>depends</" + "literal> と共に使用します。これは「依存」関係と「先行依存」関係のみを表示する" + "ためです。設定項目 - <literal>APT::Cache::Important</literal>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 #, fuzzy msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " @@@ -1349,7 -1367,7 +1367,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1359,11 -1377,11 +1377,11 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1376,7 -1394,7 +1394,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1389,7 -1407,7 +1407,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1399,7 -1417,7 +1417,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1410,7 -1428,7 +1428,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1422,7 -1440,7 +1440,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1434,14 -1452,14 +1452,14 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "ファイル" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1451,13 -1469,13 +1469,13 @@@ msgstr "関連項目 # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@@ -1465,7 -1483,7 +1483,7 @@@ msgstr "診断メッセージ # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2917,12 -2935,11 +2935,11 @@@ msgid " "realize that state (for instance, the removal of old and the installation of " "new packages)." msgstr "" - "<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管" - "理フロントエンドの &dselect; と共に使用されます。<literal>dselect-upgrade</" - "literal> は、&dselect; で作られた利用可能パッケージの<literal>Status</" - "literal> フィールドの変更を追跡し、その状態を反映させるのに必要なアクションを" - "実行します。(例えば、古いパッケージの削除や新しいパッケージのインストールな" - "ど)" + "<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント" + "エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> " + "は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー" + "ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例" + "えば、古いパッケージの削除や新しいパッケージのインストールなど)" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -2954,21 -2971,21 +2971,21 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指" "定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例" - "えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> では" - "なく libc6 を引数として与えます)。インストールするよう指定したすべてのパッ" - "ケージに対し、取得・インストールを行います。<filename>/etc/apt/sources.list</" + "えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> ではなく " + "libc6 を引数として与えます)。インストールするよう指定したすべてのパッケージに" + "対し、取得・インストールを行います。<filename>/etc/apt/sources.list</" "filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ" "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ" "がインストールされていれば削除します。同様に、インストールするパッケージを明" @@@ -3825,8 -3842,8 +3842,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> @@@ -3887,35 -3904,26 +3904,35 @@@ msgstr "アーカイブキーのローã #. 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> #. 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> #. 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> @@@ -7276,8 -7284,8 +7293,8 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" @@@ -7738,13 -7746,13 +7755,13 @@@ msgstr "APT 用パッケージリソー msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定" - "するのに使用されます。今回このマニュアルページには、Debian システム" - "で使用するパッケージシステムについてのみ記述します。この制御ファイルは、" - "<filename>/etc/apt/sources.list</filename> にあります。" + "するのに使用されます。今回このマニュアルページには、Debian システムで使用する" + "パッケージシステムについてのみ記述します。この制御ファイルは、<filename>/etc/" + "apt/sources.list</filename> にあります。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> @@@ -8307,11 -8315,11 +8324,11 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." #. type: <heading></heading> #: guide.sgml:32 diff --combined doc/po/pl.po index 559f63cfc,7bd7d0f92..74a6e462a --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -11,7 -11,7 +11,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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -949,9 -949,9 +949,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>Czyste pakiety wirtualne (Pure virtual packages)</literal> określa " "liczbę pakietów, które istnieją tylko jako nazwa pakietu wirtualnego; to " @@@ -966,14 -966,14 +966,14 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>Pojedyncze pakiety wirtualne (Single virtual packages)</literal> - " "liczba pakietów, dla których istnieje tylko jeden pakiet, który dostarcza " - "danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-" - "text-viewer\" jest pakietem wirtualnym, ale tylko jeden pakiet - xless - " - "dostarcza \"X11-text-viewer\"." + "danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-text-viewer" + "\" jest pakietem wirtualnym, ale tylko jeden pakiet - xless - dostarcza " + "\"X11-text-viewer\"." # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -981,14 -981,14 +981,14 @@@ msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>Mieszane pakiety wirtualne (Mixed virtual packages)</literal> - " "liczba pakietów, które albo dostarczają poszczególnych pakietów wirtualnych, " "albo nazywają się tak, jak nazwa pakietu wirtualnego. Na przykład w " - "systemie Debian \"debconf\" jest zarówno zwykłym pakietem, jak i " - "jest pakietem dostarczanym przez pakiet debconf-tiny." + "systemie Debian \"debconf\" jest zarówno zwykłym pakietem, jak i jest " + "pakietem dostarczanym przez pakiet debconf-tiny." # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -1010,12 -1010,19 +1010,19 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>Całkowita liczba różnych wersji (Total distinct versions)</literal> " "jest to liczba wersji pakietów znajdujących się w buforze, tak więc ta " @@@ -1037,10 -1044,15 +1044,15 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> wyświetla wszystkie pakiety źródłowe, które " "odpowiadają podanym nazwom pakietów. Wyświetlone zostaną wszystkie wersje " @@@ -1219,11 -1231,17 +1231,17 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" "Wynikowe wierzchołki będą miały różnorakie kształty: zwykłe pakiety są " "prostokątami, czyste pakiety wirtualne to trójkąty, mieszane pakiety " @@@ -1341,10 -1359,15 +1359,15 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 + #, fuzzy + #| msgid "" + #| "Print only important dependencies; for use with unmet and depends. Causes " + #| "only Depends and Pre-Depends relations to be printed. Configuration " + #| "Item: <literal>APT::Cache::Important</literal>." msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" "Wyświetla tylko ważne zależności; do używania z akcją unmet. Powoduje " "wypisanie tylko zależności typu Depends i Pre-Depends. Pozycja w pliku " @@@ -1352,7 -1375,7 +1375,7 @@@ # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 #, fuzzy #| msgid "" #| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive " @@@ -1372,7 -1395,7 +1395,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1382,11 -1405,11 +1405,11 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1401,7 -1424,7 +1424,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1414,7 -1437,7 +1437,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1424,7 -1447,7 +1447,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1437,7 -1460,7 +1460,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1450,7 -1473,7 +1473,7 @@@ msgstr " # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1461,13 -1484,13 +1484,13 @@@ msgstr " "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1477,12 -1500,12 +1500,12 @@@ msgstr "Zobacz także # #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" @@@ -1490,7 -1513,7 +1513,7 @@@ msgstr "Diagnostyka # #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2752,29 -2775,29 +2775,29 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "Po <literal>install</literal> musi występować nazwa jednego lub więcej " "pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą " "pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w " - "systemie Debian, tym argumentem byłoby libc6, a nie " - "<literal>libc6_1.9.6-2.deb</literal>). Wszystkie pakiety, które są " - "potrzebne do zainstalowania żądanego(-ych) pakietu(-ów), będą także " - "ściągnięte i zainstalowane. Plik <filename>/etc/apt/sources.list</filename> " - "zawiera listę adresów, z których będą pobierane żądane pakiety. Jeżeli po " - "nazwie pakietu pojawi się minus (bez spacji pomiędzy minusem a nazwą " - "pakietu), to ten pakiet zostanie usunięty, o ile oczywiście jest " - "zainstalowany. Podobnie znak plusa może być użyty w celu zainstalowania " - "pakietu. Ta ostatnia właściwość może być użyta do nadpisania decyzji " - "podjętych przez system rozwiązywania konfliktów programu apt-get." + "systemie Debian, tym argumentem byłoby libc6, a nie <literal>libc6_1.9.6-2." + "deb</literal>). Wszystkie pakiety, które są potrzebne do zainstalowania " + "żądanego(-ych) pakietu(-ów), będą także ściągnięte i zainstalowane. Plik " + "<filename>/etc/apt/sources.list</filename> zawiera listę adresów, z których " + "będą pobierane żądane pakiety. Jeżeli po nazwie pakietu pojawi się minus " + "(bez spacji pomiędzy minusem a nazwą pakietu), to ten pakiet zostanie " + "usunięty, o ile oczywiście jest zainstalowany. Podobnie znak plusa może być " + "użyty w celu zainstalowania pakietu. Ta ostatnia właściwość może być użyta " + "do nadpisania decyzji podjętych przez system rozwiązywania konfliktów " + "programu apt-get." # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -3661,8 -3684,8 +3684,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> @@@ -3721,33 -3744,24 +3744,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> @@@ -6283,8 -6297,8 +6306,8 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" @@@ -6611,13 -6625,13 +6634,13 @@@ msgstr "Lista zasobów pakietów dla AP msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów " "używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika " - "opisuje tylko system pakietów używany w systemie Debian. Plikiem " - "kontrolnym jest <filename>/etc/apt/sources.list</filename>." + "opisuje tylko system pakietów używany w systemie Debian. Plikiem kontrolnym " + "jest <filename>/etc/apt/sources.list</filename>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:42 @@@ -7180,8 -7194,8 +7203,8 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" "Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst " "licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL)." diff --combined doc/po/pt.po index 36a5bb607,eed14a804..e3e58cf8c --- a/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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -917,42 -917,42 +917,42 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" "<literal>Pure virtual packages</literal> é o número de pacotes que existem " "apenas como nome de pacote virtual; isto é, os pacotes apenas " "\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o " - "nome. Por exemplo, \"mail-transport-agent\" no sistema Debian é um " - "pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-" - "agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"." + "nome. Por exemplo, \"mail-transport-agent\" no sistema Debian é um pacote " + "puramente virtual; vários pacotes disponibilizam \"mail-transport-agent\", " + "mas não existe um existe um pacote chamado \"mail-transport-agent\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:108 msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" "<literal>Single virtual packages</literal> é o número de pacotes com apenas " "um pacote a disponibilizar um pacote virtual particular. Por exemplo, no " - "sistema Debian, \"X11-text-viewer\" é um pacote virtual, mas " - "apenas um pacote, xless, disponibiliza \"X11-text-viewer\"." + "sistema Debian, \"X11-text-viewer\" é um pacote virtual, mas apenas um " + "pacote, xless, disponibiliza \"X11-text-viewer\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:114 msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" "<literal>Mixed virtual packages</literal> é o número de pacotes que ou " "disponibilizam um pacote virtual particular ou têm o nome de pacote virtual " - "como o nome de pacote. Por exemplo, no sistema Debian, \"debconf\" " - "é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny." + "como o nome de pacote. Por exemplo, no sistema Debian, \"debconf\" é tanto " + "um pacote real, como também disponibilizado pelo pacote debconf-tiny." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:121 @@@ -972,12 -972,19 +972,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:128 + #, fuzzy + #| msgid "" + #| "<literal>Total distinct</literal> versions is the number of package " + #| "versions found in the cache; this value is therefore at least equal to " + #| "the number of total package names. If more than one distribution (both " + #| "\"stable\" and \"unstable\", for instance), is being accessed, this value " + #| "can be considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" "<literal>Total distinct versions</literal> é o número de versões de pacotes " "encontrados na cache; este valor é portanto pelo menos igual ao número do " @@@ -996,10 -1003,15 +1003,15 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:143 + #, fuzzy + #| msgid "" + #| "<literal>showsrc</literal> displays all the source package records that " + #| "match the given package names. All versions are shown, as well as all " + #| "records that declare the name to be a Binary." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" "<literal>showsrc</literal> mostra todos os registos de pacotes fonte que " "correspondem aos nomes de pacotes fornecidos. Todas as versões são " @@@ -1165,11 -1177,17 +1177,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:216 + #, fuzzy + #| msgid "" + #| "The resulting nodes will have several shapes; normal packages are boxes, " + #| "pure provides are triangles, mixed provides are diamonds, missing " + #| "packages are hexagons. Orange boxes mean recursion was stopped [leaf " + #| "packages], blue lines are pre-depends, green lines are conflicts." msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" "Os nós resultantes irão ter várias formas; pacotes normais são caixas, " "fornecimentos puros são triângulos, fornecimentos mistos são diamantes, " @@@ -1281,16 -1299,17 +1299,17 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" - "Escreve apenas dependências importantes; para usar com unmet e depends. " - "Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de " - "Configuração: <literal>APT::Cache::Important</literal>." + "Escreve apenas dependências importantes; para usar com <literal>unmet</" + "literal> e <literal>depends</literal>. Separa apenas relações de Depends e " + "Pre-Depends para serem escritas. Item de Configuração: <literal>APT::Cache::" + "Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 #, fuzzy #| msgid "" #| "Per default the <literal>depends</literal> and <literal>rdepends</" @@@ -1312,7 -1331,7 +1331,7 @@@ msgstr " "ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@@ -1321,11 -1340,11 +1340,11 @@@ msgstr " "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." @@@ -1338,7 -1357,7 +1357,7 @@@ msgstr " "Configuração: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1350,7 -1369,7 +1369,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@@ -1359,7 -1378,7 +1378,7 @@@ msgstr " "Configuração: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1370,7 -1389,7 +1389,7 @@@ msgstr " "<literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1381,7 -1400,7 +1400,7 @@@ msgstr " "Configuração <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1392,13 -1411,13 +1411,13 @@@ msgstr " "<literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1407,19 -1426,19 +1426,19 @@@ msgid "See Also msgstr "Veja também" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "Diagnóstico" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2845,15 -2864,15 +2864,15 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" "<literal>install</literal> é seguido por um ou mais pacotes desejados para " "instalação ou actualização. Cada pacote é um nome de pacote, não um nome de " @@@ -3696,8 -3715,8 +3715,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> @@@ -3757,33 -3776,24 +3776,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> @@@ -7341,17 -7351,17 +7360,17 @@@ msgstr "Pin: release n=&testing-codenam #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" "nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem " - "pertencer ao lançamento de Debian versão 3.0. Note que não há " - "normalmente um número de versão para as distribuições <literal>testing</" - "literal> e <literal>unstable</literal>. porque ainda não foram lançadas. " - "Especificar isto no ficheiro de preferências do APT irá requerer uma das " - "seguintes linhas:" + "pertencer ao lançamento de Debian versão 3.0. Note que não há normalmente um " + "número de versão para as distribuições <literal>testing</literal> e " + "<literal>unstable</literal>. porque ainda não foram lançadas. Especificar " + "isto no ficheiro de preferências do APT irá requerer uma das seguintes " + "linhas:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml:471 @@@ -7779,13 -7789,13 +7798,13 @@@ msgstr "Lista de recursos de pacote par msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" "A lista de recursos de pacote é usada para localizar arquivos do sistema de " "distribuição de pacotes usado no sistema. Neste momento, este manual " - "documenta apenas o sistema de pacotes usado pelo sistema Debian. " - "Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>." + "documenta apenas o sistema de pacotes usado pelo sistema Debian. Este " + "ficheiro de controle é <filename>/etc/apt/sources.list</filename>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:42 @@@ -8345,11 -8355,11 +8364,11 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" - "Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/" - "common-licenses/GPL para a licença completa." + "Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/common-" + "licenses/GPL para a licença completa." #. type: <heading></heading> #: guide.sgml:32 diff --combined doc/po/pt_BR.po index 47c565ed1,396e0f098..e8b83c257 --- a/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-05-23 17:06+0300\n" + "POT-Creation-Date: 2012-05-24 15:57+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" @@@ -736,9 -736,9 +736,9 @@@ msgid " "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " - "\"mail-transport-agent\" in the Debian system is a pure virtual " - "package; several packages provide \"mail-transport-agent\", but there is no " - "package named \"mail-transport-agent\"." + "\"mail-transport-agent\" in the Debian system is a pure virtual package; " + "several packages provide \"mail-transport-agent\", but there is no package " + "named \"mail-transport-agent\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -746,8 -746,8 +746,8 @@@ msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " - "Debian system, \"X11-text-viewer\" is a virtual package, but only " - "one package, xless, provides \"X11-text-viewer\"." + "Debian system, \"X11-text-viewer\" is a virtual package, but only one " + "package, xless, provides \"X11-text-viewer\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -755,8 -755,8 +755,8 @@@ msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " - "as the package name. For instance, in the Debian system, \"debconf" - "\" is both an actual package, and provided by the debconf-tiny package." + "as the package name. For instance, in the Debian system, \"debconf\" is both " + "an actual package, and provided by the debconf-tiny package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -774,9 -774,9 +774,9 @@@ msgstr " msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " - "total package names. If more than one distribution (both \"stable\" and " - "\"unstable\", for instance), is being accessed, this value can be " - "considerably larger than the number of total package names." + "total package names. If more than one distribution is being accessed (for " + "instance, \"stable\" and \"unstable\"), this value can be considerably " + "larger than the number of total package names." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@@ -791,7 -791,7 +791,7 @@@ msgstr " msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " - "records that declare the name to be a Binary." + "records that declare the name to be a binary package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -904,9 -904,9 +904,9 @@@ msgstr " #: apt-cache.8.xml:216 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " - "pure provides are triangles, mixed provides are diamonds, missing packages " - "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " - "lines are pre-depends, green lines are conflicts." + "pure virtual packages are triangles, mixed virtual packages are diamonds, " + "missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " + "packages), blue lines are pre-depends, green lines are conflicts." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -987,13 -987,13 +987,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:274 msgid "" - "Print only important dependencies; for use with unmet and depends. Causes " - "only Depends and Pre-Depends relations to be printed. Configuration Item: " - "<literal>APT::Cache::Important</literal>." + "Print only important dependencies; for use with <literal>unmet</literal> and " + "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " + "be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:287 + #: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@@ -1003,25 -1003,25 +1003,25 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:294 + #: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:299 + #: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" - "versions</option> is specified, only the candidate version will displayed " + "versions</option> is specified, only the candidate version will be displayed " "(the one which would be selected for installation). This option is only " "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:308 + #: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" @@@ -1029,14 -1029,14 +1029,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:314 + #: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:319 + #: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@@ -1044,7 -1044,7 +1044,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:325 + #: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@@ -1052,7 -1052,7 +1052,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt-cache.8.xml:332 + #: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@@ -1060,13 -1060,13 +1060,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 + #: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 + #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 @@@ -1076,19 -1076,19 +1076,19 @@@ msgid "See Also msgstr "Consulte também" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:350 + #: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 + #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-cache.8.xml:355 + #: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@@ -2141,15 -2141,15 +2141,15 @@@ msgstr " msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " - "qualified filename (for instance, in a Debian system, libc6 would " - "be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " - "packages required by the package(s) specified for installation will also be " - "retrieved and installed. The <filename>/etc/apt/sources.list</filename> " - "file is used to locate the desired packages. If a hyphen is appended to the " - "package name (with no intervening space), the identified package will be " - "removed if it is installed. Similarly a plus sign can be used to designate " - "a package to install. These latter features may be used to override " - "decisions made by apt-get's conflict resolution system." + "qualified filename (for instance, in a Debian system, libc6 would be the " + "argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " + "required by the package(s) specified for installation will also be retrieved " + "and installed. The <filename>/etc/apt/sources.list</filename> file is used " + "to locate the desired packages. If a hyphen is appended to the package name " + "(with no intervening space), the identified package will be removed if it is " + "installed. Similarly a plus sign can be used to designate a package to " + "install. These latter features may be used to override decisions made by apt-" + "get's conflict resolution system." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -2715,8 -2715,8 +2715,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> @@@ -2761,23 -2761,23 +2761,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> @@@ -5432,17 -5432,17 +5432,17 @@@ msgstr " #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " - "belong to Debian release version 3.0. Note that there is normally " - "no version number for the <literal>testing</literal> and <literal>unstable</" + "belong to Debian release version 3.0. Note that there is normally no " + "version number for the <literal>testing</literal> and <literal>unstable</" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" "dá nome a versão da distribuição. Por exemplo, os pacote na àrvore podem " - "pertencer a distribuição Debian versão 3.0. Note que normalmente " - "não existe número de versão para as distribuições <literal>testing</literal> " - "e <literal>unstable</literal> devido as mesmas não terem sido lançadas " - "ainda. Especificar isso no arquivo de preferências do APT iria requerer uma " - "das linhas a seguir." + "pertencer a distribuição Debian versão 3.0. Note que normalmente não existe " + "número de versão para as distribuições <literal>testing</literal> e " + "<literal>unstable</literal> devido as mesmas não terem sido lançadas ainda. " + "Especificar isso no arquivo de preferências do APT iria requerer uma das " + "linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #: apt_preferences.5.xml:471 @@@ -5884,8 -5884,8 +5884,8 @@@ msgstr " msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " - "documents only the packaging system used by the Debian system. " - "This control file is <filename>/etc/apt/sources.list</filename>." + "documents only the packaging system used by the Debian system. This control " + "file is <filename>/etc/apt/sources.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> @@@ -6284,8 -6284,8 +6284,8 @@@ msgstr " #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" - "For more details, on Debian systems, see the file /usr/share/" - "common-licenses/GPL for the full license." + "For more details, on Debian systems, see the file /usr/share/common-licenses/" + "GPL for the full license." msgstr "" #. type: <heading></heading>