diff options
38 files changed, 7155 insertions, 370 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 01c6242dc..8ab0c74c6 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -30,7 +30,6 @@ #include <sys/wait.h> #include <signal.h> #include <errno.h> -#include <string.h> #include <stdio.h> #include <string.h> #include <algorithm> @@ -1594,7 +1593,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) string::size_type pos; FILE *report; - if (_config->FindB("Dpkg::ApportFailureReport", false) == false) + if (_config->FindB("Dpkg::ApportFailureReport", true) == false) { std::clog << "configured to not write apport reports" << std::endl; return; @@ -1621,18 +1620,49 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) } // do not report out-of-memory failures - if(strstr(errormsg, strerror(ENOMEM)) != NULL) { + if(strstr(errormsg, strerror(ENOMEM)) != NULL || + strstr(errormsg, "failed to allocate memory") != NULL) { std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl; return; } - // do not report dpkg I/O errors - // XXX - this message is localized, but this only matches the English version. This is better than nothing. - if(strstr(errormsg, "short read in buffer_copy (")) { - std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + // do not report bugs regarding inaccessible local files + if(strstr(errormsg, strerror(ENOENT)) != NULL || + strstr(errormsg, "cannot access archive") != NULL) { + std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl; + return; + } + + // do not report errors encountered when decompressing packages + if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) { + std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl; return; } + // do not report dpkg I/O errors, this is a format string, so we compare + // the prefix and the suffix of the error with the dpkg error message + vector<string> io_errors; + io_errors.push_back(string("failed to read on buffer copy for %s")); + io_errors.push_back(string("failed in write on buffer copy for %s")); + io_errors.push_back(string("short read on buffer copy for %s")); + + for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++) + { + vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%'); + if (list.size() > 1) { + // we need to split %s, VectorizeString only allows char so we need + // to kill the "s" manually + if (list[1].size() > 1) { + list[1].erase(0, 1); + if(strstr(errormsg, list[0].c_str()) && + strstr(errormsg, list[1].c_str())) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } + } + } + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); @@ -1722,6 +1752,24 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) char buf[1024]; while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); + fprintf(report, " \n"); + fclose(log); + } + } + + // attach history log it if we have it + string histfile_name = _config->FindFile("Dir::Log::History"); + if (!histfile_name.empty()) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "DpkgHistoryLog:\n"); + log = fopen(histfile_name.c_str(),"r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); fclose(log); } } diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 76278921f..4818174ac 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -92,6 +92,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 912b2d609..4ed56ef0d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1068,7 +1068,7 @@ bool DoBuildDep(CommandLine &CmdL) for (; Ver != verlist.end(); ++Ver) { forbidden.clear(); - if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) + if (Ver->MultiArch == pkgCache::Version::None) { if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); @@ -1086,7 +1086,7 @@ bool DoBuildDep(CommandLine &CmdL) else if (strcmp(D->Package.c_str() + colon, ":native") == 0) Pkg = Ver.ParentPkg().Group().FindPkg("native"); } - else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) + else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All) { if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg("native"); @@ -1376,7 +1376,10 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, return true; // error - return _error->Error("changelog download failed"); + pkgRecords Recs(CacheFile); + pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); + string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg(); + return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str()); } /*}}}*/ // DoChangelog - Get changelog from the command line /*{{{*/ diff --git a/cmdline/apt-key b/cmdline/apt-key index 713a41c07..b9cfe1e34 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -25,17 +25,16 @@ GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always" GPG="$GPG_CMD" -MASTER_KEYRING="" -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg +# ubuntu keyrings +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg eval $(apt-config shell MASTER_KEYRING APT::Key::MasterKeyring) -ARCHIVE_KEYRING_URI="" -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg -eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI) - -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg eval $(apt-config shell ARCHIVE_KEYRING APT::Key::ArchiveKeyring) -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys) +ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg +eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI) +TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg requires_root() { if [ "$(id -u)" -ne 0 ]; then @@ -57,7 +56,7 @@ init_keyring() { add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 MASTER=$2 - + if [ ! -f "$ADD_KEYRING" ]; then echo "ERROR: '$ADD_KEYRING' not found" return @@ -72,12 +71,28 @@ add_keys_with_verify_against_master_keyring() { # all keys that are exported must have a valid signature # from a key in the $distro-master-keyring add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` + all_add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^[ps]ub | cut -d: -f5` master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5` + + # ensure there are no colisions LP: #857472 + for all_add_key in $all_add_keys; do + for master_key in $master_keys; do + if [ "$all_add_key" = "$master_key" ]; then + echo >&2 "Keyid collision for '$all_add_key' detected, operation aborted" + return 1 + fi + done + done + for add_key in $add_keys; do - ADDED=0 + # export the add keyring one-by-one + rm -f $TMP_KEYRING + $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key + # check if signed with the master key and only add in this case + ADDED=0 for master_key in $master_keys; do - if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then - $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import + if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then + $GPG --import $TMP_KEYRING ADDED=1 fi done @@ -85,12 +100,16 @@ add_keys_with_verify_against_master_keyring() { echo >&2 "Key '$add_key' not added. It is not signed with a master key" fi done + rm -f $TMP_KEYRING } # update the current archive signing keyring from a network URI # the archive-keyring keys needs to be signed with the master key # (otherwise it does not make sense from a security POV) net_update() { + # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128)) + exit 1 + if [ -z "$ARCHIVE_KEYRING_URI" ]; then echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set" exit 1 @@ -110,7 +129,7 @@ net_update() { if [ -e $keyring ]; then old_mtime=$(stat -c %Y $keyring) fi - (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) + (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi @@ -124,7 +143,7 @@ net_update() { update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-archive-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi requires_root diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index d105f440a..db38958fa 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -85,6 +85,7 @@ for kernel in $kernels; do echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-tools-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new <<EOF }; diff --git a/debian/apt.conf.changelog b/debian/apt.conf.changelog new file mode 100644 index 000000000..c4092ff44 --- /dev/null +++ b/debian/apt.conf.changelog @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 2616af1dd..3b3133b57 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -436,6 +436,13 @@ fi UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then + # check for a new archive signing key (against the master keyring) + if eval apt-key net-update $XSTDERR; then + debug_echo "apt-key net-update (success)" + else + debug_echo "apt-key net-update (failure)" + fi + # run apt-get update if eval apt-get $XAPTOPT -y update $XSTDERR; then debug_echo "download updated metadata (success)." if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then @@ -449,6 +456,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then fi update_stamp $UPDATE_STAMP UPDATED=1 + # now run apt-xapian-index if it is installed to ensure the index + # is up-to-date + if [ -x /usr/sbin/update-apt-xapian-index ]; then + nice ionice -c3 update-apt-xapian-index -q -u + fi else debug_echo "download updated metadata (error)" fi diff --git a/debian/apt.dirs b/debian/apt.dirs index 6d492a30f..ecbcdbc0a 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -14,4 +14,5 @@ var/lib/apt/lists/partial var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt +usr/share/apt usr/share/bug/apt diff --git a/debian/changelog b/debian/changelog index 8d7936da2..246102a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -apt (0.9.13.1) UNRELEASED; urgency=low +apt (0.9.13.1~ubuntu2) UNRELEASED; urgency=low + + * add autopkgtest support for the integration testsuite + * merge mvo/feature/edit-sources + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Nov 2013 14:37:36 +0100 + +apt (0.9.13.1~ubuntu1) trusty; urgency=low [ Colin Watson ] * fix "apt-get --purge build-dep" (closes: #720597) @@ -7,11 +14,9 @@ apt (0.9.13.1) UNRELEASED; urgency=low [ Michael Vogt ] * add "-f" option to "build-dep" as sbuild is using it to fix regression with cross-building (LP: #1255806) - * add autopkgtest support for the integration testsuite * merge mvo/feature/short-list - * merge mvo/feature/edit-sources - -- Michael Vogt <mvo@debian.org> Thu, 28 Nov 2013 20:02:39 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Nov 2013 21:17:43 +0100 apt (0.9.13) unstable; urgency=low @@ -21,6 +26,36 @@ apt (0.9.13) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Sun, 24 Nov 2013 10:56:22 +0100 +apt (0.9.13~exp1ubuntu3) trusty; urgency=low + + * Fix "apt-get --purge build-dep" (closes: #720597). + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 26 Nov 2013 15:40:02 +0000 + +apt (0.9.13~exp1ubuntu2) trusty; urgency=low + + * Fix two subprocess calls to continue to honour APT::Keep-Fds + (LP: #1254696). + + -- Colin Watson <cjwatson@ubuntu.com> Mon, 25 Nov 2013 16:49:25 +0000 + +apt (0.9.13~exp1ubuntu1) trusty; urgency=low + + * merged from the debian/sid branch: + - debian/gbp.conf: change build branch to ubuntu/master + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + - debian/apt.auto-removal.sh + + Keep linux-tools packages matching installed kernels + + -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 23 Nov 2013 09:13:14 +0100 + apt (0.9.13~exp1) experimental; urgency=low * Improve the API for APT::Upgrade::Upgrade() @@ -340,6 +375,49 @@ apt (0.9.9.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 11 Jul 2013 20:44:31 +0200 +apt (0.9.9.1~ubuntu5) trusty; urgency=low + + * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204 + LP: #1206047 + + -- TJ Guthrie (TJ) <TJ.Guthrie@mail.wvu.edu> Mon, 18 Nov 2013 03:06:36 -0500 + +apt (0.9.9.1~ubuntu4) trusty; urgency=low + + * No change rebuild against db 5.3. + + -- Dmitrijs Ledkovs <xnox@ubuntu.com> Sat, 02 Nov 2013 14:02:38 +0000 + +apt (0.9.9.1~ubuntu3) saucy; urgency=low + + * Keep linux-tools packages matching installed kernels (LP: #1205284) + + -- Adam Conrad <adconrad@ubuntu.com> Wed, 11 Sep 2013 11:48:09 -0400 + +apt (0.9.9.1~ubuntu2) saucy; urgency=low + + * Prefer native architecture over higher priority for providers (closes: + #718482). + + -- Colin Watson <cjwatson@ubuntu.com> Thu, 01 Aug 2013 16:33:32 +0100 + +apt (0.9.9.1~ubuntu1) saucy; urgency=low + + * merged from the debian/sid branch: + - debian/gbp.conf: change build branch to ubuntu/master + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + - debian/apt.auto-removal.sh + + make kernels auto-removable + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 10 Jul 2013 17:03:52 +0200 + apt (0.9.9) unstable; urgency=low [ Michael Vogt ] @@ -423,6 +501,67 @@ apt (0.9.8) unstable; urgency=low - Do not propagate negative scores from rdepends. Propagating the absolute value of a negative score may boost obsolete packages and keep them installed instead of installing their successors. (Closes: #699759) + + [ Michael Vogt ] + * apt-pkg/sourcelist.cc: + - fix segfault when a hostname contains a [, thanks to + Tzafrir Cohen (closes: #704653) + * debian/control: + - replace manpages-it (closes: #704723) + + [ David Kalnischkies ] + * various simple changes to fix cppcheck warnings + * apt-pkg/pkgcachegen.cc: + - do not store the MD5Sum for every description language variant as + it will be the same for all so it can be shared to save cache space + - handle language tags for descriptions are unique strings to be shared + - factor version string creation out of NewDepends, so we can easily reuse + version strings e.g. for implicit multi-arch dependencies + - equal comparisions are used mostly in same-source relations, + so use this to try to reuse some version strings + - sort group and package names in the hashtable on insert + - share version strings between same versions (of different architectures) + to save some space and allow quick comparisions later on + * apt-pkg/pkgcache.cc: + - assume sorted hashtable entries for groups/packages + * apt-pkg/cacheiterators.h: + - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck + * apt-pkg/deb/debversion.cc: + - add a string-equal shortcut for equal version comparisions + + [ Marc Deslauriers ] + * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + [ Yaroslav Halchenko ] + * Fix English spelling error in a message ('A error'). Unfuzzy + translations. Closes: #705087 + + [ Programs translations ] + * French translation completed (Christian Perrier) + + [ Manpages translations ] + * French translation completed (Christian Perrier) + + [ Daniel Hartwig ] + * apt-pkg/contrib/strutl.cc: + - include port in shortened URIs (e.g. with apt-cache policy, progress + display) thanks to James McCoy (Closes: #154868, #322074) + - percent-encode username and password when writing URIs + * methods/http.cc: + - properly escape IP-literals (e.g. IPv6 address) when building + Host headers and URIs (Closes: #620344) + * methods/https.cc: + - use https_proxy environment variable if present, falling back to + http_proxy otherwise + - use authentication credentials from proxy URI + (Closes: #651640, LP: #1087512) + - environment variables do not override an explicit no proxy + directive ("DIRECT") in apt.conf + - disregard all_proxy environment variable, like other methods + + -- Michael Vogt <mvo@debian.org> Wed, 08 May 2013 18:43:28 +0200 + +apt (0.9.7.9~exp3) experimental; urgency=low [ Michael Vogt ] * apt-pkg/sourcelist.cc: @@ -626,6 +765,50 @@ apt (0.9.7.8~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 14:16:42 +0100 +apt (0.9.7.7ubuntu4) raring; urgency=low + + [ Michael Vogt ] + * test/integration/test-bug-1078697-missing-source-hashes: + - add test for deb-src hash generation + + [ Marc Deslauriers ] + * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Apr 2013 14:52:15 +0200 + +apt (0.9.7.7ubuntu3) raring; urgency=low + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Mar 2013 14:25:56 +0100 + +apt (0.9.7.7ubuntu2) raring; urgency=low + + * Cherry-pick from David's sid branch to fix a multiarch library + installation problem: + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - prefer to install packages which have an already installed M-A:same + sibling while choosing providers (LP: #1130419) + + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Mar 2013 17:55:03 -0800 + +apt (0.9.7.7ubuntu1) raring; urgency=low + + * Merge from Debian unstable, pulling in new translations and fixes. + * Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard. + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 18 Jan 2013 00:32:14 -0700 + apt (0.9.7.7) unstable; urgency=low [ Program translation updates ] @@ -661,6 +844,81 @@ apt (0.9.7.7) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 13 Dec 2012 09:52:19 +0100 +apt (0.9.7.6ubuntu6) raring; urgency=low + + * merged from the debian-sid branch + + [ Program translation updates ] + * Catalan (Jordi Mallach) + * Drop a confusing non-breaking space. Closes: #691024 + * Thai (Theppitak Karoonboonyanan). Closes: #691613 + * Vietnamese (Trần Ngọc Quân). Closes: #693773 + * Fix Plural forms in German, French, Japanese and Portuguese + translations. Thanks to Jakub Wilk for reporting these errors. + + [ Michael Vogt ] + * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2012 09:14:54 +0100 + +apt (0.9.7.6ubuntu5) raring; urgency=low + + * Revert build-dependency from gettext:any to gettext, now that gettext is + Multi-Arch: foreign. + + -- Colin Watson <cjwatson@ubuntu.com> Thu, 29 Nov 2012 15:43:21 +0000 + +apt (0.9.7.6ubuntu4) raring; urgency=low + + * Fix mismerge of cross-build-dependency handling patch from + 0.8.16~exp12ubuntu7. + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 20 Nov 2012 18:16:36 +0000 + +apt (0.9.7.6ubuntu3) raring; urgency=low + + * Fix comment char in /etc/apt/apt.conf.d/01autoremove-kernels to + use C++ style comments instead of POSIX shell style (LP: #1076237) + + -- Adam Conrad <adconrad@ubuntu.com> Wed, 07 Nov 2012 23:10:35 -0700 + +apt (0.9.7.6ubuntu2) raring; urgency=low + + * Fix up two things in debian/apt.auto-removal.sh: + - Use exact matches with $-terminated regexes, so we don't get + confusion between similarly-named kernel flavours. + - Keep linux-backports-modules in sync with installed kernels. + + -- Adam Conrad <adconrad@ubuntu.com> Tue, 06 Nov 2012 15:54:31 -0700 + +apt (0.9.7.6ubuntu1) raring; urgency=low + + [ Michael Vogt ] + * merged from debian-sid + + [ Program translation updates ] + * Catalan (Jordi Mallach) + * Drop a confusing non-breaking space. Closes: #691024 + * Thai (Theppitak Karoonboonyanan). Closes: #691613 + + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not do lock-step configuration for a M-A:same package if it isn't + unpacked yet in SmartConfigure and do not unpack a M-A:same package + again in SmartUnPack if we have already configured it (LP: #1062503) + + [ Steve Langasek ] + * debian/apt.conf.autoremove: don't include linux-image*, + linux-restricted-modules*, and linux-ubuntu-modules* packages in the + list to never be autoremoved. + * debian/apt.auto-removal.sh, debian/rules, debian/apt.dirs: install new + script to /etc/kernel/postinst.d/ which ensures we only automatically + keep the currently-running kernel, the being-installed kernel, and the + newest kernel, so we don't fill /boot up with an unlimited number of + kernels. LP: #923876. + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Nov 2012 15:12:36 +0100 + apt (0.9.7.6) unstable; urgency=low [ Program translation updates ] @@ -699,6 +957,93 @@ apt (0.9.7.6) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 16 Oct 2012 18:08:53 +0200 +apt (0.9.7.5ubuntu5) quantal; urgency=low + + * Revert "missing remap registration" change from 0.9.7.5ubuntu4; this + iterator was already registered, and double registration causes a crash + (LP: #1067056). + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 16 Oct 2012 11:35:59 +0100 + +apt (0.9.7.5ubuntu4) quantal-proposed; urgency=low + + [ Colin Watson ] + * apt-pkg/pkgcachegen.cc: + - Fix crash if the cache is remapped while writing a Provides version + (LP: #1066445). + + Cherry-pick from http://bzr.debian.org/bzr/apt/apt/debian-sid: + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - add a missing remap registration causing a segfault in case + we use the not remapped iterators after a move of the mmap again + + -- Colin Watson <cjwatson@ubuntu.com> Sun, 14 Oct 2012 23:54:27 +0100 + +apt (0.9.7.5ubuntu3) quantal-proposed; urgency=low + + * Refresh translations from Launchpad. Amongst other fixes, this drops the + erroneous "个" from "Retrieving file ..." translation in zn_CN. + (LP: #985634) + + -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 12 Oct 2012 13:01:30 +0200 + +apt (0.9.7.5ubuntu2) quantal; urgency=low + + Merged from lp:~donkult/apt/experimental: + + [ David Kalnischkies ] + * apt-pkg/contrib/strutl.cc: + - support \n and \r\n line endings in ReadMessages + + [ Michael Vogt ] + * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: + - merge fix for LP: #346386 + + + Merged from http://bzr.debian.org/bzr/apt/apt/debian-sid: + + [ David Kalnischkies ] + * apt-pkg/cdrom.cc: + - copy only configured translation files from a CD-ROM and not all + available translation files preventing new installs with d-i from + being initialized with all translations (Closes: #678227) + - handle Components in the reduction for the source.list as multi-arch CDs + otherwise create duplicated source entries (e.g. "wheezy main main") + * apt-pkg/packagemanager.cc: + - unpack versions only in case a different version from the package + is currently in unpack state to recover from broken system states + (like different file in M-A:same package and other dpkg errors) + and avoid re-unpack otherwise (Closes: #670900) + * debian/control: + - let libapt-pkg break apt < 0.9.4 to ensure that the installed http- + method supports the new redirection-style, thanks to Raphael Geissert + for reporting & testing (Closes: #685192) + * doc/apt_preferences.5.xml: + - use the correct interval (x <= P < y) for pin value documentation as + these are the intervals used by the code (Closes: #685989) + * apt-pkg/indexcopy.cc: + - do not create duplicated flat-archive CD-ROM sources for foreign + architectures on multi-arch CD-ROMs + - do not warn about files which have a record in the Release file, but + are not present on the CD to mirror the behavior of the other methods + and to allow uncompressed indexes to be dropped without scaring users + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Sep 2012 15:42:09 +0200 + +apt (0.9.7.5ubuntu1) quantal; urgency=low + + [ Michael Vogt ] + * merged latest fixes from the debian-sid branch + + [ TJ ] + * apt-pkg/contrib/netrc.cc: + - increase LOGINSIZE/PASSWORDSIZE limits and add proper error + if the limits are reached (LP: #1008289) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Aug 2012 12:06:48 +0200 + apt (0.9.7.5) unstable; urgency=low [ Manpages translation updates ] @@ -842,6 +1187,19 @@ apt (0.9.7.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 13 Jul 2012 21:33:56 +0200 +apt (0.9.7.1ubuntu2) quantal; urgency=low + + * ftparchive/override.cc: + - Double maximum override line length to 1000 (LP: #1038961). + + -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 Aug 2012 12:04:30 +0100 + +apt (0.9.7.1ubuntu1) quantal; urgency=low + + * merged from the debian-sid branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jun 2012 15:33:42 +0200 + apt (0.9.7.1) unstable; urgency=low [ Program translation updates ] @@ -900,6 +1258,44 @@ apt (0.9.7) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 19 Jun 2012 16:42:43 +0200 +apt (0.9.6ubuntu3) quantal; urgency=low + + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is still insecure + - cmdline/apt-key: exit 1 immediately in net_update() + - CVE-2012-0954 + - LP: #1013639 + + -- Jamie Strandboge <jamie@ubuntu.com> Fri, 15 Jun 2012 08:03:17 -0500 + +apt (0.9.6ubuntu2) quantal; urgency=low + + * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to + Marc Deslauriers. (LP: #1013128) + + -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 Jun 2012 11:29:48 -0500 + +apt (0.9.6ubuntu1) quantal; urgency=low + + [ Michael Vogt ] + * merged from Debian, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + + [ Steve Langasek ] + * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu, + removed in previous LTS. + * prepare-release: declare the packages needed as source build deps. + + -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Jun 2012 22:36:16 +0000 + apt (0.9.6) unstable; urgency=low [ David Kalnischkies ] @@ -1410,6 +1806,152 @@ apt (0.8.16~exp13) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 18:12:57 +0100 +apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low + + [ Malcolm Scott ] + * apt-pkg/packagemanager.cc: + - Fix a regression in the pre-depend handling: where a pre-depend option + other than the first specified is already installed, apt-get enters an + infinite loop (LP: #985852) + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc: + - add APT::pkgPackageManager::MaxLoopCount to ensure that the + ordering code does not get into a endless loop when it flip-flops + between two states + + [ David Kalnischkies ] + * apt-pkg/cacheset.cc: + - actually return to the fallback modifier if we have detected we + should for packagenames which look like modifiers (Closes: #669591) + LP: #982716 + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 20 Apr 2012 11:10:12 +0200 + +apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low + + * apt-inst/contrib/extracttar.cc: + - ensure that in StartGzip the InFd is set to "AutoClose" to ensure + that the pipe is closed when InFd is closed. This fixes a Fd leak + (LP: #985452) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Apr 2012 11:38:43 +0200 + +apt (0.8.16~exp12ubuntu8) precise; urgency=low + + * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010) + + -- Adam Conrad <adconrad@ubuntu.com> Thu, 12 Apr 2012 16:26:20 -0600 + +apt (0.8.16~exp12ubuntu7) precise; urgency=low + + * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was + dropped in maverick. + * Build-depend on gettext:any for cross-building support. + * Don't treat build-depends-indep as cross-build-dependencies; we should + always install the host arch versions. LP: #968828. + * Makefile, po/makefile: make sure our pot generation datestamp doesn't + change at build time, since this makes translations fail to be + co-installable with multiarch. Based on a patch by David Kalnischkies. + Closes: #659333, LP: #924628. + * For cross-build-dependencies, Architecture: all packages should be + treated as implicitly Multi-Arch: foreign, because either they *are* + M-A: foreign when used as a build-dependency, or they need to be updated + to not be Architecture: all; and since cross-build-deps are new + functionality in apt, we can safely make this change without breaking + existing systems. Closes: #666772. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 05 Apr 2012 18:00:23 -0700 + +apt (0.8.16~exp12ubuntu6) precise; urgency=low + + * cherry pick from + http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/: + * apt-pkg/packagemanager.cc: + - fix bug in predepends handling - ensure that packages that needs + unpackaging are unpacked before they are configured (LP: #927993) + * apt-pkg/packagemanager.cc: + - do not try to a void a breaks if the broken package pre-depends + on the breaker, but let dpkg auto-deconfigure it + * apt-pkg/packagemanager.cc: + - recheck all dependencies if we changed a package in SmartConfigure + as this could break an earlier dependency (LP: #940396) + * recheck dependencies in SmartUnpack after a change, too + * add Debug::pkgAcqArchive::NoQueue to disable package downloading + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Mar 2012 19:46:08 +0100 + +apt (0.8.16~exp12ubuntu5) precise; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid branch, most notably: + - Correct fi translation for hash sum mismatches (LP: #420403) + Thanks to Jani Uusitalo + - remove 'old' InRelease file if we can't get a new one before + proceeding with Release.gpg to avoid the false impression of a still + trusted repository by a (still present) old InRelease file. + Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Mar 2012 17:52:50 +0100 + +apt (0.8.16~exp12ubuntu4) precise; urgency=low + + * apt-pkg/contrib/fileutl.h: + - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Feb 2012 10:06:28 +0100 + +apt (0.8.16~exp12ubuntu3) precise; urgency=low + + * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to + handle compressed files again (LP: #924182). + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 31 Jan 2012 11:19:46 +0000 + +apt (0.8.16~exp12ubuntu2) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - chroot if needed before dpkg --assert-multi-arch + - ensure that dpkg binary doesn't have the chroot-directory prefixed + * apt-pkg/depcache.cc: + - if a M-A:same package is marked for reinstall, mark all it's installed + silbings for reinstallation as well (LP: #859188) + * apt-pkg/contrib/configuration.cc: + - do not stop parent transversal in FindDir if the value is empty + * methods/http{s,}.cc: + - if a file without an extension is requested send an 'Accept: text/*' + header to avoid that the server chooses unsupported compressed files + in a content-negotation attempt (Closes: #657560) + * apt-pkg/aptconfiguration.cc: + - chroot if needed before calling dpkg --print-foreign-architectures + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix crash when a package is in removed but residual config state + (LP: #923807) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Jan 2012 21:03:12 +0100 + +apt (0.8.16~exp12ubuntu1) precise; urgency=low + + [ Michael Vogt ] + * merge from debian/experimental: + - new ABI + + [ Steve Langasek ] + * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that + we resolve virtual package Breaks more effectively. Thanks to Colin + Watson for the patch. Closes: #657695, LP: #922485. + * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not + a signed short, because large upgrades can result in an overflow for + core packages. Thanks again to Colin Watson. Closes: #657732, + LP: #917173. + * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH. + Closes: #646288. + + -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 29 Jan 2012 00:44:16 +0000 + apt (0.8.16~exp12) experimental; urgency=low [ Michael Vogt ] @@ -1602,6 +2144,189 @@ apt (0.8.16~exp6) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 21:06:51 +0200 +apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low + + [ Daniel Hahler ] + * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200 + +apt (0.8.16~exp5ubuntu14.2) precise; urgency=low + + * Call update-apt-xapian-index with -u on all arches in + cron.daily to make it behave slightly more pleasantly. + + -- Adam Conrad <adconrad@ubuntu.com> Mon, 09 Jan 2012 07:41:03 -0700 + +apt (0.8.16~exp5ubuntu14.1) precise; urgency=low + + * apt-pkg/edsp.cc: + - fix FTBFS + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 17:56:49 +0200 + +apt (0.8.16~exp5ubuntu14) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - refactor MergeList by creating -Group, -Package and -Version specialist + - share description list between "same" versions (LP: #868977) + This also means that descriptions are shared across archives now. + * apt-pkg/pkgcache.cc: + - always prefer "en" over "" for "en"-language regardless of cache-order + (LP: #868977) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 16:22:31 +0200 + +apt (0.8.16~exp5ubuntu13) oneiric; urgency=low + + [ Adam Conrad ] + * On armel, call update-apt-xapian-index with '-u' to keep the CPU + and I/O usage low. We would do this on all arches, but there's a + regression risk here, but that's better than killing slow systems. + + [ Michael Vogt ] + * cmdline/apt-key: + - fix apt-key net-update, thanks to Marc Deslauriers and + Adam Conrad for the code review (LP: #857472) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 06 Oct 2011 16:14:41 +0200 + +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - fix crash when the dynamic mmap needs to be remapped during + LoadReleaseInfo (LP: #854090) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Sep 2011 13:31:11 +0200 + +apt (0.8.16~exp5ubuntu11) oneiric; urgency=low + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + [ Marc Deslauriers ] + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is insecure. + - cmdline/apt-key: exit immediately out of net_update(). + - CVE number pending + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 22 Sep 2011 17:30:45 +0200 + +apt (0.8.16~exp5ubuntu10) oneiric; urgency=low + + * methods/https.cc: + - cleanup broken downloads properly (just like http) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 20 Sep 2011 18:26:13 +0200 + +apt (0.8.16~exp5ubuntu9) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc: + - fix fetching translated package descriptions (including the newly + stripped out english ones) by adding OptionalSubIndexTarget + + [ David Kalnischkies ] + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found try to verify with hashes, + but do not fail if a hash can't be found + * apt-pkg/indexrecords.cc: + - fix Acquire::Max-ValidTime option by interpreting it really + as seconds as specified in the manpage and not as days + - add an Acquire::Min-ValidTime option (Closes: #640122) + * doc/apt.conf.5.xml: + - reword Acquire::Max-ValidTime documentation to make clear + that it doesn't provide the new Min-ValidTime functionality + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 16 Sep 2011 09:50:16 +0200 + +apt (0.8.16~exp5ubuntu8) oneiric; urgency=low + + * cherry pick r1825 from lp:~mvo/apt/mvo: + * apt-pkg/contrib/configuration.cc: + - fix double delete (LP: #848907) + - ignore only the invalid regexp instead of all options + + * cherry pick r2165 from lp:~donkult/apt/sid: + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - output list of virtual package providers to c1out in -q=1 + instead of /dev/null to unbreak sbuild (LP: #816155) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 18:23:09 +0200 + +apt (0.8.16~exp5ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * cherry pick revision 2173 from lp:~donkult/apt/sid + + [ David Kalnischkies ] + - M-A:same lockstep unpack should operate on installed + packages first (LP: #835625) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 09:03:33 +0200 + +apt (0.8.16~exp5ubuntu6) oneiric; urgency=low + + [ Michael Vogt + * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to + Jonathan Riddell + + [ David Kalnischkies ] + * lots of cppcheck fixes + * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc: + - ignore "self"-conflicts for all architectures of a package + instead of just for the architecture of the package locked at + in the ordering of installations too (Closes: #802901) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Aug 2011 11:32:58 +0200 + +apt (0.8.16~exp5ubuntu5) oneiric; urgency=low + + * debian/control: + - fix VCS location + * methods/mirror.cc: + - include the architecture(s) in the query string as well so + that the server can make better decisions + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:03:19 +0200 + +apt (0.8.16~exp5ubuntu4) oneiric; urgency=low + + * Merge change from Robert Collins to upgrade ubuntu-keyring recommends + to a hard dependency to match Debian behaviour and fix LP: #816606 + + -- Adam Conrad <adconrad@ubuntu.com> Tue, 09 Aug 2011 14:48:24 -0600 + +apt (0.8.16~exp5ubuntu3) oneiric; urgency=low + + * apt-pkg/acquire.cc: + - fix potential divide-by-zero (LP: #823277) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 15:56:44 +0200 + +apt (0.8.16~exp5ubuntu2) oneiric; urgency=low + + * test/integration/test-hashsum-verification: + - add regression test for hashsum verification + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found, still load the hashes for + verification (closes: #636314) and add test + * apt-pkg/pkgcachegen.cc: + - fix incorrect comparision when checking sources.list freshness + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 09:22:14 +0200 + +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low + + * merged new version from debian/experimental, this includes + a ABI break and two new library packages + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 08 Aug 2011 14:30:07 +0200 + apt (0.8.16~exp5) experimental; urgency=low * merged the latest debian-sid fixes @@ -1888,6 +2613,14 @@ apt (0.8.15.6) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 15 Aug 2011 09:20:35 +0200 +apt (0.8.15.5ubuntu1) oneiric; urgency=low + + * apt-pkg/pkgcachegen.{cc,h}: + - fix crash when P.Arch() was used but the cache got remapped + (LP: #812862) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Aug 2011 15:18:50 +0200 + apt (0.8.15.5) unstable; urgency=low [ David Kalnischkies ] @@ -1896,6 +2629,28 @@ apt (0.8.15.5) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 28 Jul 2011 16:49:15 +0200 +apt (0.8.15.4ubuntu2) oneiric; urgency=low + + * apt-pkg/contrib/fileutl.{cc,h}: + - add GetModificationTime() helper + * apt-pkg/pkgcachegen.cc: + - regenerate the cache if the sources.list changes to ensure + that changes in the ordering there will be honored by apt + * apt-pkg/sourcelist.{cc,h}: + - add pkgSourceList::GetLastModifiedTime() helper + * apt-pkg/pkgcachegen.{cc,h}: + - use ref-to-ptr semantic in NewDepends() to ensure that the + libapt does not segfault if the cache is remapped in between + (LP: #812862) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 18:25:22 +0200 + +apt (0.8.15.4ubuntu1) oneiric; urgency=low + + * merged from debian-sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jul 2011 13:19:49 +0200 + apt (0.8.15.4) unstable; urgency=low [ David Miller ] @@ -1960,6 +2715,39 @@ apt (0.8.15.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 25 Jul 2011 15:04:43 +0200 +apt (0.8.15.2ubuntu2) oneiric; urgency=low + + * cmdline/apt-get.cc: + - fix missing download progress in apt-get download + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Jul 2011 13:20:49 +0200 + +apt (0.8.15.2ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - improve error message for a expired Release file + * apt-pkg/algorithms.cc: + - Hold back packages that would enter "policy-broken" state on upgrade + when doing a "apt-get upgrade" + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - fallback to memory if file is not writeable even if access() + told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) + * doc/sources.list.5.xml: + - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Jul 2011 10:16:45 +0200 + apt (0.8.15.2) unstable; urgency=high * fix from David Kalnischkies for the InRelease gpg verification @@ -1967,6 +2755,24 @@ apt (0.8.15.2) unstable; urgency=high -- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200 +apt (0.8.15.1ubuntu2) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - do not report errors encountered when decompressing packages + + [ Michael Vogt ] + * fix from David Kalnischkies for the InRelease gpg verification + code (LP: #784473) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Jul 2011 14:42:02 +0200 + +apt (0.8.15.1ubuntu1) oneiric; urgency=low + + * merge from debian/sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Jun 2011 09:16:12 +0100 + apt (0.8.15.1) unstable; urgency=low [ David Kalnischkies ] @@ -1990,6 +2796,17 @@ apt (0.8.15.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 30 Jun 2011 10:05:36 +0200 +apt (0.8.15ubuntu1) oneiric; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Jun 2011 09:03:39 +0100 + apt (0.8.15) unstable; urgency=low [ Julian Andres Klode ] @@ -2278,6 +3095,101 @@ apt (0.8.14.2) UNRELEASED; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.changelog: + - add missing ";", thanks to Julian Andres Klode + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - updated allocate memory string + - cannot access archive string is lowercase + * apt-pkg/deb/dpkgpm.cc: + - resolve issue where AptOrdering is included in DpkgTerminalLog in apport + attachments + + -- Brian Murray <brian@ubuntu.com> Wed, 15 Jun 2011 14:00:43 -0700 + +apt (0.8.14.1ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/deblistparser.cc: + - include all known languages when building the apt cache + (LP: #794907) + * apt-pkg/deb/debindexfile.cc: + - remove some no longer valid checks for "TranslationsAvailable()" + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Jun 2011 13:56:25 +0200 + +apt (0.8.14.1ubuntu6) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - prevent reporting of package installation failures due to inaccessible + local files (LP: #791102, #790040) + - include /var/log/apt/history.log in apport-package reports so we know + the context for the package management request + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Jun 2011 15:55:07 +0200 + +apt (0.8.14.1ubuntu5) oneiric; urgency=low + + * apt-pkg/acquire-item.cc: + - do not reject empty Packages files when checking them for + correctness + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 May 2011 10:41:30 +0200 + +apt (0.8.14.1ubuntu4) oneiric; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 May 2011 17:12:27 +0200 + +apt (0.8.14.1ubuntu3) oneiric; urgency=low + + * Rebuild with recent binutils. LP: #774175. + + -- Matthias Klose <doko@ubuntu.com> Mon, 23 May 2011 19:15:34 +0200 + +apt (0.8.14.1ubuntu2) oneiric; urgency=low + + * debian/rules: + - build in verbose mode by default (thanks to Matthias Klose) + * debian/control: + - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 May 2011 13:58:10 +0200 + +apt (0.8.14.1ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid bzr branch + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Apr 2011 17:55:20 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: @@ -2320,6 +3232,42 @@ apt (0.8.14) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Fri, 15 Apr 2011 14:28:15 +0200 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray <brian@ubuntu.com> Wed, 20 Apr 2011 15:05:12 -0700 + +apt (0.8.13.2ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Apr 2011 12:52:21 +0200 + +apt (0.8.13.2ubuntu1) natty; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] @@ -2356,6 +3304,12 @@ apt (0.8.13.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200 +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid (LP: #744832) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Apr 2011 14:40:51 +0200 + apt (0.8.13.1) unstable; urgency=low * apt-pkg/acquire-item.cc: Use stat buffer if stat was @@ -2363,6 +3317,24 @@ apt (0.8.13.1) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Sat, 02 Apr 2011 20:55:35 +0200 +apt (0.8.13ubuntu2) natty; urgency=low + + * po/makefile: + - add hack to run MSGMERGE again if it segfaults. this is to help + powerpc to bootstrap + * mirror method: + - merge fix from Matt Zimmerman, many thanks (LP: #741098) + - do not crash if the mirror file fails to download + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Mar 2011 18:01:38 +0100 + +apt (0.8.13ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the + apt mirror method + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] @@ -2384,6 +3356,29 @@ apt (0.8.13) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100 +apt (0.8.12ubuntu2) unstable; urgency=low + + [ Thorsten Spindler ] + * methods/rsh.cc + - fix rsh/ssh option parsing (LP: #678080), thanks to + Ville Mattila + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - mark pkgAcqIndexTrans as Index-File to avoid asking the + user to insert the CD on each apt-get update + * methods/mirror.cc: + - improve debug output and fix bug in TryNextMirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100 + +apt (0.8.12ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the udev based + cdrom handling and multiarch handling + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 16:12:22 +0100 + apt (0.8.12) unstable; urgency=low [ Michael Vogt ] @@ -2437,6 +3432,23 @@ apt (0.8.12) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 10 Mar 2011 14:46:48 +0100 +apt (0.8.11.5ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/debindexfile.cc: + - ignore missing deb-src files in /var/lib/apt/lists, thanks + to Thorsten Spindler (LP: #85590) + * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: + - honor Dpkg::Chroot-Directory in the RunScripts*() methods + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Mar 2011 17:39:30 +0100 + +apt (0.8.11.5ubuntu1) natty; urgency=low + + * Merged from debian/sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Feb 2011 12:01:19 +0100 + apt (0.8.11.5) unstable; urgency=low [ Christian Perrier ] @@ -2668,6 +3680,27 @@ apt (0.8.10.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 17 Jan 2011 13:41:04 +0100 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - ignore lzma "Cannot allocate memory" errors, thanks to Brian + Murray + - add i18n support for the "short read in buffer_copy %s" handling + from dpkg + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Jan 2011 18:26:05 +0100 + +apt (0.8.10ubuntu1) natty; urgency=low + + [ Julian Andres Klode ] + * cmdline/apt-cache.cc: Create an error for apt-cache depends + if packages could not found (LP: #647045) + + [ Michael Vogt ] + * merged from debian-sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Dec 2010 15:53:49 +0100 + apt (0.8.10) unstable; urgency=low [ Programs translations ] @@ -2687,6 +3720,48 @@ apt (0.8.10) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 30 Nov 2010 10:42:17 +0100 +apt (0.8.9ubuntu4) natty; urgency=low + + [ Michael Vogt ] + * cmdline/apt-key: + - set timeout of wget for net-update to 90 seconds (thanks to \sh) + + [ Martin Pitt ] + * Revert r1819 and r1820 to disable compressed indexes by default again. + Testing has brought up a few places where this seriously degrades + performance, mostly in applications which iterate through all available + package records, like update-apt-xapian-index or synaptic. See + https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Nov 2010 08:50:37 +0100 + +apt (0.8.9ubuntu3) natty; urgency=low + + * methods/http.cc: + - do not hang if Acquire::http::ProxyAutoDetect can not be + executed or returns no data (LP: #654393) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Nov 2010 10:42:50 +0100 + +apt (0.8.9ubuntu2) natty; urgency=low + + * drop apt-changelog, apt-get changelog implements all the + features it provides + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:22:40 +0100 + +apt (0.8.9ubuntu1) natty; urgency=low + + * re-merged from the debian-sid bzr branch + * merged lp:~mvo/apt/mvo, this brings two new commands: + - apt-get download binary-pkgname to download a deb + - apt-get changelog binary-pkgname to display the changelog + * cmdline/apt-get.cc: + - if the changelog download failed, do not show the generic error + but point to launchpad instead + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:02:14 +0100 + apt (0.8.9) unstable; urgency=low [ Christian Perrier ] @@ -2718,6 +3793,47 @@ apt (0.8.9) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 18 Nov 2010 09:25:04 +0100 +apt (0.8.8ubuntu3) natty; urgency=low + + * cmdline/apt-changelog: Filter out multiple results for a source package, + just take the latest one. + * cmdline/apt-changelog: Read server name from configuration + APT::Changelog::Server instead of hardcoding it. This allows local users + to point to a local changelog mirror, or make this script work for Debian. + * Add debian/apt.conf.changelog: Configuration for apt-changelog with the + server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules. + * doc/apt-changelog.1.xml: Document the new option. + * test/integration/test-compressed-indexes, test/test-indexes.sh: + - Explicitly disable compressed indexes at the start. This ensures that we + will actually test uncompressed indexes regardless of the internal + default value of Acquire::GzipIndexes. + * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to + store compressed indexes. This feature is now mature enough for general + consumption. Update doc/apt.conf.5.xml accordingly. + * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default + to preferring "gz", so that compressed indexes will actually work. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Nov 2010 12:14:15 +0100 + +apt (0.8.8ubuntu2) natty; urgency=low + + * Add cmdline/apt-changelog: Script to fetch package changelog from + changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules. + * Add doc/apt-changelog.1.xml, and install it in debian/rules. + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 09 Nov 2010 11:32:27 +0100 + +apt (0.8.8ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Oct 2010 10:07:09 -0400 + apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] @@ -2737,6 +3853,17 @@ apt (0.8.8) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 28 Oct 2010 21:22:21 +0200 +apt (0.8.7ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Oct 2010 18:31:17 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] @@ -2855,6 +3982,92 @@ apt (0.8.4) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 10 Sep 2010 20:45:15 +0200 +apt (0.8.3ubuntu7) maverick; urgency=low + + [ 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 + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Oct 2010 14:13:38 +0200 + +apt (0.8.3ubuntu6) maverick; urgency=low + + [ Michael Vogt ] + * 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 ] + * 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 <michael.vogt@ubuntu.com> Fri, 01 Oct 2010 15:25:00 +0200 + +apt (0.8.3ubuntu5) maverick; urgency=low + + * debian/apt.dirs: + - add missing /usr/share/apt so that the keyring is installed + into the right place (LP: #620576) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 22 Sep 2010 18:34:18 +0200 + +apt (0.8.3ubuntu4) maverick; urgency=low + + * merged lp:~mvo/apt/conflicts-on-virtuals to better deal + with conflicts/breaks against virtual packages (LP: #614993) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:48:26 +0200 + +apt (0.8.3ubuntu3) maverick; urgency=low + + * merged fixes from debian-sid + + [ Michael Vogt ] + * apt-pkg/contrib/cdromutl.cc: + - if apt-cdrom is used on writable media (like usb-sticks), do + not use the root directory to identify the medium (as all + changes there change the ident id). Use the .disk directory + instead + + [ David Kalnischkies ] + * ftparchive/writer.cc: + - null the valid string instead of the date if Valid-Until is not set + * apt-pkg/acquire-item.cc: + - use also unsigned Release files again (Closes: #596189) + + [ Christian Perrier ] + * Fix missing space after dot in a message from apt-pkg + Translations unfuzzied. Thanks to Holger Wansing. + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Sep 2010 21:45:49 +0200 + +apt (0.8.3ubuntu2) maverick; urgency=low + + * ftparchive/writer.cc: + - write out {Files,Checksum-Sha1,Checksum-Sha256} only if + available LP: #633967. Thanks to Colin Watson + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200 + +apt (0.8.3ubuntu1) maverick; urgency=low + + * merged fixes from debian-sid + * debian/rules: + - put ubuntu-archive.gpg back into the package (LP: #620576) + * apt-pkg/init.cc: + - ignore ".distUpgrade" and ".save" files in sources.list.d + (LP: #631770) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200 + apt (0.8.3) unstable; urgency=low [ Programs translations ] @@ -2947,6 +4160,69 @@ apt (0.8.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200 +apt (0.8.0ubuntu3) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Simplified Chinese (Aron Xu). Closes: #594458 + * Bulgarian (Damyan Ivanov). Closes: #594627 + * Portuguese (Miguel Figueiredo). Closes: #594668 + * Korean (Changwoo Ryu). Closes: #594809 + + [ Manpages translations ] + * Portuguese (Américo Monteiro) + + [ David Kalnischkies ] + * cmdline/apt-cache.cc: + - remove useless GetInitialize method + * cmdline/apt-get.cc: + - remove direct calls of ReadMainList and use the wrapper instead + to protect us from useless re-reads and two-times notice display + - remove death code by removing unused GetInitialize + * apt-pkg/depcache.cc: + - now that apt-get purge works on 'rc' packages let the MarkDelete + pass this purge forward to the non-pseudo package for pseudos + * apt-pkg/contrib/fileutl.cc: + - apply SilentlyIgnore also on files without an extension + * apt-pkg/contrib/configuration.cc: + - fix autoremove by using correct config-option name and + don't make faulty assumptions in error handling (Closes: #594689) + * apt-pkg/versionmatch.cc: + - let the pin origin actually work as advertised in the manpage + which means "" are optional and pinning a local archive does + work - even if it is a non-flat archive (Closes: #594435) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 17:05:53 +0200 + +apt (0.8.0ubuntu2) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Thai (Theppitak Karoonboonyanan). Closes: #592695 + * Russian (Yuri Kozlov). Closes: #594232 + * Slovak (Ivan Masár). Closes: #594255 + * Swedish (Daniel Nylander). Closes: #594241 + * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265 + * Italian (Milo Casagrande). Closes: #594238 + * Asturian (maacub). Closes: #594303 + + [ Christian Perrier ] + * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki + Closes: #594211 + + [ David Kalnischkies ] + * show in madison command again also source packages (LP: #614589) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Aug 2010 18:56:23 +0200 + +apt (0.8.0ubuntu1) maverick; urgency=low + + * merged from debian/unstable + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200 + apt (0.8.0) unstable; urgency=low [ Michael Vogt ] @@ -2989,6 +4265,20 @@ apt (0.8.0~pre2) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 23 Aug 2010 19:09:08 +0200 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - enable apport reports again (got lost in the previous merge), + thanks to Matt Zimmerman + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Aug 2010 13:53:09 +0200 + +apt (0.8.0~pre1ubuntu1) maverick; urgency=low + + * merged fixes from debian/experimental + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 17:49:40 +0200 + apt (0.8.0~pre1) experimental; urgency=low [ Programs translations ] @@ -3031,6 +4321,56 @@ apt (0.8.0~pre1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 13 Aug 2010 17:00:49 +0200 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/fileutl.cc: + - Add WriteAtomic mode. + - Revert WriteEmpty to old behavior (LP: #613211) + * apt-pkg, methods: + - Convert users of WriteEmpty to WriteAtomic. + * apt-pkg/depcache.cc: + - Only try upgrade for Breaks if there is a newer version, otherwise + handle it as Conflicts (by removing it) (helps for #591882). + + [ Michael Vogt ] + * debian/control: + - Add recommends on gnupg to apt, apt-key uses it. + (changed from debian) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Aug 2010 12:01:30 +0200 + +apt (0.7.26~exp12ubuntu3) maverick; urgency=low + + [ Colin Watson ] + * apt-pkg/cdrom.cc: + - fix off-by-one error in DropBinaryArch + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200 + +apt (0.7.26~exp12ubuntu2) maverick; urgency=low + + * debian/apt.postinst: + - do not fail if ubuntu-keyring is not installed + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200 + +apt (0.7.26~exp12ubuntu1) maverick; urgency=low + + * ABI break upload + * merged from debian/experimental, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + * debian/apt.postinst + - drop set_apt_proxy_from_gconf(), no longer needed in maverick + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200 + apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] @@ -3645,6 +4985,152 @@ apt (0.7.26~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100 +apt (0.7.25.3ubuntu10) maverick; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.ubuntu: + - no longer install (empty) apt.conf.d/01ubuntu + * apt-pkg/deb/dpkgpm.cc: + - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) + - fix FTBFS (LP: #600155) + + [ Matthias G. ] + * apt-pkg/deb/dpkgpm.cc: + - Fix segmentation fault when /var/log/apt ist missing. LP: #535509 + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Jul 2010 09:37:03 +0200 + +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low + + * debian/apt.postinst: + - do not fail if getent returns nothing useful (LP: #579647) + thanks to Jean-Baptiste Lallement + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200 + +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low + + [ Loïc Minier ] + * Use https:// in Vcs-Bzr URL. + + [ Michael Vogt ] + * apt-pkg/deb/debrecords.cc: + - fix max tag buffer size (LP: #545336, closes: #578959) + * apt-pkg/indexfile.cc: + - If no "_" is found in the language code, try to find a "." + This is required for languages like Esperanto that have no + county associated with them (LP: #560956) + Thanks to "Aisano" for the fix + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200 + +apt (0.7.25.3ubuntu7) lucid; urgency=low + + Cherry pick fixes from the lp:~mvo/apt/mvo branch: + + [ Evan Dandrea ] + * Remember hosts with general failures for + https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831). + + [ Michael Vogt ] + * improve debug output for Debug::pkgPackageManager + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200 + +apt (0.7.25.3ubuntu6) lucid; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty (LP: #556056) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200 + +apt (0.7.25.3ubuntu5) lucid; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - try version match in FindSrc first exact than fuzzy (LP: #551178) + + [ Jean-Baptiste Lallement ] + * apt-pkg/contrib/strutl.cc: + - always escape '%' (LP: #130289) (Closes: #500560) + - unescape '%' sequence only if followed by 2 hex digit + - username/password are urlencoded in proxy string (RFC 3986) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200 + +apt (0.7.25.3ubuntu4) lucid; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + LP: #540228 + * cmdline/apt-get.cc, apt-pkg/cdrom.cc: + - fix memory leaks in error conditions in DoSource() + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Mar 2010 16:57:49 +0100 + +apt (0.7.25.3ubuntu3) lucid; urgency=low + + * apt-pkg/indexfile.cc: + - remove "cs" from languages that need the full langcode when + downloading translations (thanks to Steve Langasek) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Mar 2010 09:42:39 +0100 + +apt (0.7.25.3ubuntu2) lucid; urgency=low + + [ Michael Vogt ] + * abicheck/ + - add new abitest tester using the ABI Compliance Checker from + http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker + * debian/apt.conf.autoremove: + - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used + for transitional packages + * apt-pkg/deb/dpkgpm.cc: + - fix backgrounding when dpkg runs (closes: #486222) + * cmdline/apt-mark: + - show error on incorrect aguments (LP: #517917), thanks to + Torsten Spindler + * cmdline/apt-get.cc: + - if apt-get source foo=version or foo/distro can not be found, + error out (LP: #502641) + * apt-pkg/indexfile.cc: + - deal correctly with three letter langcodes (LP: #391409) + * debian/apt.cron.daily: + - do not look into admin users gconf anymore for the http proxy + the user now needs to use the "Apply system-wide" UI in the + gnome-control-center to set it + * debian/apt.postinst: + - add set_apt_proxy_from_gconf() and run that once on upgrade if + there is no proxy configured already system-wide (LP: #432631) + From that point on gnome-control-center will have to warn if + the user makes changes to the proxy settings and does not apply + them system wide + + [ Robert Collins ] + * Change the package index Info methods to allow apt-cache policy to be + useful when using several different archives on the same host. + (Closes: #329814, LP: #22354) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Mar 2010 23:10:52 +0100 + +apt (0.7.25.3ubuntu1) lucid; urgency=low + + [ Michael Vogt ] + * merged with the debian-sid branch + * methods/http.cc: + - add Acquire::http::ProxyAutoDetect configuration that + can be used to call a external helper to figure out the + proxy configuration and return it to apt via stdout + (this is a step towards WPAD and zeroconf/avahi support) + + [ Ivan Masár ] + * Slovak translation update. Closes: #568294 + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Feb 2010 23:33:32 +0100 + apt (0.7.25.3) unstable; urgency=low [ Christian Perrier ] @@ -3765,6 +5251,39 @@ apt (0.7.25.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> 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 <michael.vogt@ubuntu.com> Tue, 02 Feb 2010 16:58:59 -0800 + +apt (0.7.25ubuntu3) lucid; urgency=low + + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) + + -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100 + +apt (0.7.25ubuntu2) lucid; urgency=low + + * Change history branch so that it does not break the + apt ABI for the pkgPackageManager interface + (can be reverted on the next ABI break) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 10:14:16 +0100 + +apt (0.7.25ubuntu1) lucid; urgency=low + + * Merged from the mvo branch + * merged from the lp:~mvo/apt/history branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100 + apt (0.7.25) unstable; urgency=low [ Christian Perrier ] @@ -3908,6 +5427,29 @@ apt (0.7.25) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100 +apt (0.7.24ubuntu1) lucid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - include df -l output in the apport log as well (thanks to + tjaalton) + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used + * methods/https.cc: + - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 + thanks to Brian Thomason for the patch + * merge lp:~mvo/apt/netrc branch, this adds support for a + /etc/apt/auth.conf that can be used to store username/passwords + in a "netrc" style file (with the extension that it supports "/" + in a machine definition). Based on the maemo git branch. + + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Dec 2009 09:27:26 +0100 + apt (0.7.24) unstable; urgency=low [ Nicolas François ] @@ -3977,6 +5519,59 @@ apt (0.7.24) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200 +apt (0.7.23.1ubuntu2) karmic; urgency=low + + [ Michael Vogt ] + * debian/control: + - fix Vcr-Bzr header + + [ Kees Cook ] + * debian/apt.cron.daily: + - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200 + +apt (0.7.23.1ubuntu1) karmic; urgency=low + + [ Matt Zimmerman ] + * apt-pkg/deb/dpkgpm.cc: + - Suppress apport reports on dpkg short reads (these I/O errors are not + generally indicative of a bug in the packaging) + + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) + + [ Brian Murray ] + * cmdline/apt-get.cc: + - typo fix (LP: #370094) + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - when tcgetattr() returns non-zero skip all pty magic + (thanks to Simon Richter, closes: #509866) + * apt-inst/contrib/arfile.cc: + - show propper error message for Invalid archive members + * apt-pkg/acquire-worker.cc: + - show error details of failed methods + * apt-pkg/contrib/fileutl.cc: + - if a process aborts with signal, show signal number + * methods/http.cc: + - ignore SIGPIPE, we deal with EPIPE from write in + HttpMethod::ServerDie() (LP: #385144) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it + (LP: #135262) + + [ Merge ] + * merged from debian, reverted the libdlopen-udev branch + because its too late in the release process for this now + * not merged the proxy behaviour change from 0.7.23 (that will + be part of lucid) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200 + apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] @@ -4206,6 +5801,34 @@ apt (0.7.22) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200 +apt (0.7.21ubuntu1) karmic; urgency=low + + * merged from the debian-sid bzr branch + + [ Christian Perrier ] + * Documentation translations: + - Fix a typo in apt-get(8) French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + * Translations: + - fr.po + - sk.po. Closes: #525857 + - ru.po. Closes: #526816 + - eu.po. Closes: #528985 + - zh_CN.po. Closes: #531390 + - fr.po + - it.po. Closes: #531758 + - ca.po. Closes: #531921 + * Added translations + - ast.po (Asturian by Marcos Alvareez Costales). + Closes: #529007, #529730 + + [ Michael Vogt ] + * apt-pkg/acquire.cc: + - make the (internal) max pipeline depth of the acquire queue + configurable via Acquire::Max-Pipeline-Depth + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] @@ -4249,6 +5872,125 @@ apt (0.7.21) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200 +apt (0.7.20.2ubuntu7) karmic; urgency=low + + * fix problematic use of tolower() when calculating the version + hash by using locale independant tolower_ascii() function. + Thanks to M. Vefa Bicakci (LP: #80248) + * build fixes for g++-4.4 + * include dmesg output in apport package failures + * include apt ordering into apport package failures + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Apr 2009 10:14:01 +0200 + +apt (0.7.20.2ubuntu6) jaunty; urgency=low + + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files (LP: #354793) + + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + LP: #356012 + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Apr 2009 22:39:50 +0200 + +apt (0.7.20.2ubuntu5) jaunty; urgency=low + + [ Colin Watson ] + * cmdline/acqprogress.cc: + - Call pkgAcquireStatus::Pulse even if quiet, so that we still get + dlstatus messages on the status-fd (LP: #290234). + + [ Michael Vogt ] + * debian/apt.cron.daily: + - do not clutter cron mail with bogus gconftool messages + (LP: #223502) + - merge fix for cache locking from debian (closes: #459344) + - run update-apt-xapian-index (with ionice) to ensure that + the index is up-to-date when synaptic is run (LP: #288797) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200 + +apt (0.7.20.2ubuntu4) jaunty; urgency=low + + * ftparchive/cachedb.cc: + - when apt-ftparchive clean is used, compact the database + at the end (thanks to cprov) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Mar 2009 13:43:59 +0100 + +apt (0.7.20.2ubuntu3) jaunty; urgency=low + + * methods/mirror.cc: + - when download the mirror file and the server is down, + return a propper error message (LP: #278635) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Mar 2009 15:42:15 +0100 + +apt (0.7.20.2ubuntu2) jaunty; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - revert termios patch (LP: #338514) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Mar 2009 16:33:28 +0100 + +apt (0.7.20.2ubuntu1) jaunty; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + + [ Michael Vogt ] + * merged from the debian-sid branch + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove + blacklist + * fix some i18n issues (thanks to Gabor Kelemen) + LP: #263089 + * apt-pkg/deb/dpkgpm.cc: + - filter "ENOMEM" errors when creating apport reports + * cmdline/apt-get.cc: + - fix "apt-get source pkg=ver" if binary name != source name + (LP: #202219) + * apt-pkg/indexrecords.cc: + - fix some i18n issues + * apt-pkg/contrib/strutl.h: + - add new strprintf() function to make i18n strings easier + * apt-pkg/dev/debsystem.cc: + - add missing apti18n.h header + * cmdline/apt-get.cc: + - default to "false" for the "APT::Get::Build-Dep-Automatic" + option (follow debian here) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) + * methods/https.cc: + - add Acquire::https::AllowRedirect support + - do not unlink files in partial/ (thanks to robbiew) + + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100 + apt (0.7.20.2) unstable; urgency=medium [ Eugene V. Lyubimkin ] @@ -4317,6 +6059,12 @@ apt (0.7.20) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100 +apt (0.7.19ubuntu1) jaunty; urgency=low + + * merge from debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +0100 + apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] @@ -4615,6 +6363,90 @@ apt (0.7.15~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200 +apt (0.7.14ubuntu7) jaunty; urgency=low + + * cmdline/apt-cache.cc: + - remove the gettext from a string that consists entirely + of variables (LP: #56792) + * apt-pkg/deb/dpkgpm.cc: + - fix potential hang when in a backgroud process group + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2008 21:09:12 +0100 + +apt (0.7.14ubuntu6) intrepid; urgency=low + + * debian/apt.conf.autoremove: + - remove "linux-image" (and friends) from the auto-remove + blacklist. we have the kernel fallback infrastructure now + in intrepid (thanks to BenC) + * apt-pkg/indexcopy.cc: + - support having CDs with no Packages file (just a Packages.gz) + by not forcing a verification on non-existing files + (LP: #255545) + * apt-pkg/deb/dpkgpm.cc: + - improve the filtering for duplicated apport reports (thanks + to seb128 for pointing that problem out) + - do not report disk full errors from dpkg via apport + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Aug 2008 16:28:05 +0200 + +apt (0.7.14ubuntu5) intrepid; urgency=low + + * fix various -Wall warnings + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Aug 2008 14:00:51 +0200 + +apt (0.7.14ubuntu4) intrepid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix uninitialized variable that caused no apport reports + to be written sometimes (thanks to Matt Zimmerman) + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * document --install-recommends and --no-install-recommends + (thanks to Dereck Wonnacott, LP: #126180) + + [ Dereck Wonnacott ] + * apt-ftparchive might write corrupt Release files (LP: #46439) + * Apply --important option to apt-cache depends (LP: #16947) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Aug 2008 10:10:49 +0200 + +apt (0.7.14ubuntu3) intrepid; urgency=low + + [ Otavio Salvador ] + * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan + Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476 + * Avoid using dbus if dbus-daemon isn't running. Closes: #438803 + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - improve apt progress reporting, display trigger actions + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (LP: #236360) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 Jun 2008 17:27:07 +0200 + +apt (0.7.14ubuntu2) intrepid; urgency=low + + * debian/control: + - fix FTBFS by adding missing intltool dependency + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 09 May 2008 13:50:22 +0200 + apt (0.7.14) unstable; urgency=low [ Christian Perrier ] @@ -4841,6 +6673,268 @@ apt (0.7.10) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 07 Jan 2008 21:40:47 +0100 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low + + * apt-pkg/acquire-item.cc: + - fix signaure removal on transient network failures LP: #220627 + (thanks to Scott James Remnant) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Apr 2008 16:32:49 +0200 + +apt (0.7.9ubuntu16) hardy; urgency=low + + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200 + +apt (0.7.9ubuntu15) hardy; urgency=low + + * cmdline/apt-get.cc: + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies. This should + fix livecd building for kubuntu (thanks to Jonathan Riddell + for reporting the problem) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Mar 2008 23:25:45 +0100 + +apt (0.7.9ubuntu14) hardy; urgency=low + + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + - run the problemResolver after a task was installed + so that it can correct any missing dependencies + * typo fixes (LP: #107960) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Mar 2008 21:46:07 +0100 + +apt (0.7.9ubuntu13) hardy; urgency=low + + [ Lionel Porcheron ] + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) + + [ Michael Vogt ] + * doc/apt_preferences.5.xml: + - fix typo (LP: #150900) + * doc/example/sources.list: + - updated for hardy (LP: #195879) + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Mar 2008 15:35:09 +0100 + +apt (0.7.9ubuntu12) hardy; urgency=low + + * debian/apt.cron.daily: + - use admin user proxy settings + * cmdline/apt-get.cc: + - fix task installation (thanks to Colin Watson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100 + +apt (0.7.9ubuntu11) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + (LP: #188127) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100 + +apt (0.7.9ubuntu10) hardy; urgency=low + + * cmdline/apt-key: + - add "net-update" command that fetches the + ubuntu-archive-keyring.gpg and add keys from it that are + signed by the ubuntu-master-keyring.gpg + (apt-archive-key-signatures spec) + * debian/apt.cron.daily: + - add apt-key net-update to the nightly cron job + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Feb 2008 15:50:28 +0100 + +apt (0.7.9ubuntu9) hardy; urgency=low + + * fix FTBFS due to incorrect intltool build-depends + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 16:04:37 +0100 + +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100 + +apt (0.7.9ubuntu7) hardy; urgency=low + + * methods/connect.cc: + - remember hosts with Resolve failures or connect Timeouts + see https://wiki.ubuntu.com/NetworklessInstallationFixes + * cmdlines/apt-key: + - fix bug in the new apt-key update code that imports only + keys signed with the master key (thanks to cjwatson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Feb 2008 11:38:35 +0100 + +apt (0.7.9ubuntu6) hardy; urgency=low + + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * apt-pkg/deb/dpkgpm.cc: + - add APT::Apport::MaxReports to limit the maximum number + of reports generated in a single run (default to 3) + * apt-pkg/deb/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Feb 2008 14:28:02 +0100 + +apt (0.7.9ubuntu5) hardy; urgency=low + + * Merged apt-authentication-reliabilty branch. This means + that apt will refuse to update and use the old lists if + the authentication of a repository that used to be + authenticated fails. See + https://wiki.ubuntu.com/AptAuthenticationReliability + for more details. + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jan 2008 10:36:10 +0100 + +apt (0.7.9ubuntu4) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to + true, the effect of the compatibility code was to require both of them + to be set to false in order to disable list cleanup; this broke the + installer. Instead, disable list cleanup if either of them is set to + false. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:34:37 +0000 + +apt (0.7.9ubuntu3) hardy; urgency=low + + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 19:02:11 +0100 + +apt (0.7.9ubuntu2) hardy; urgency=low + + [ Otavio Salvador ] + * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan <rmh@aybabtu.com> to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston <alexander.winston@comcast.net> + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + [ Program translations ] + - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. + + [ Michael Vogt ] + * apt-pkg/packagemanager.{cc,h}: + - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder. (LP: #179247) + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jan 2008 11:31:45 +0100 + +apt (0.7.9ubuntu1) hardy; urgency=low + + * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining + changes: + - mirror download method (pending merge with debian) + - no pdiff download by default (unsuitable for ubuntu) + - no recommends-by-default yet + - add "Original-Maintainer" field to tagfile + - show warning on apt-get source if the package is maintained + in a VCS (pedinging merge with debian) + - use ubuntu-archive keyring instead of debians one + - support metapackages section for autoremoval + - debian maintainer field change + - send ubuntu string in user-agent + + * Changes from the debian-sid bzr branch (but not uploaded to debian + yet): + + [ Otavio Salvador ] + * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + + [ Program translations ] + - Basque updated. Closes: #453088 + + [ Michael Vogt ] + * debian/rules + - fix https install location + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * methods/mirror.{cc,h}: + - only update mirror list on IndexFile updates + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 14:46:27 +0100 + apt (0.7.9) unstable; urgency=low [ Christian Perrier ] @@ -4966,6 +7060,193 @@ apt (0.7.7) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - give up timeslice on EIO error in read from master terminal + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Martin Emrich ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - rewrite dpkgpm.cc to use pselect() instead of select() + to block signals during select() (LP: #134858) + + -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 20 Oct 2007 07:51:12 +0200 + +apt (0.7.6ubuntu14) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix resource leak (LP: #148806) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Oct 2007 20:57:44 +0200 + +apt (0.7.6ubuntu13) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix crash in WriteApportReport (LP: #144537) + * apt-pkg/acquire-item.cc + - fix disappearing local Packages.gz file (LP: #131166) + * methods/https.cc: + - fix off-by-one error I-M-S handling + - cleanup after I-M-S hit + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Oct 2007 01:48:26 +0200 + +apt (0.7.6ubuntu12) gutsy; urgency=low + + [ Michael Vogt ] + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file + (thanks to Laurent Bigonville, LP: #140019) + * apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray <rmurray@debian.org> for the patch + + [Paul Sladen] + * Have 'cron.daily/apt' send D-Bus doesn't exist error messages + to the bit bucket. Thanks to 'dasdda'. (LP: #115397) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 03 Oct 2007 02:17:45 +0200 + +apt (0.7.6ubuntu11) gutsy; urgency=low + + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 (LP: #144001) + + -- Colin Watson <cjwatson@ubuntu.com> Sat, 22 Sep 2007 21:39:29 +0100 + +apt (0.7.6ubuntu10) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix parse error when dpkg sends unexpected data + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Sep 2007 17:25:09 +0100 + +apt (0.7.6ubuntu9) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix progress reporting precent calculation (LP: #137798) + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + (LP: #136767) + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes LP: #125733 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled (LP: #139448) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200 + +apt (0.7.6ubuntu8) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.{cc,h}: + - fix bug in dpkg log writing when a signal is caught during + select() (LP: #134858) + - write end marker in the log as well + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 Sep 2007 15:03:46 +0200 + +apt (0.7.6ubuntu7) gutsy; urgency=low + + * reupload to fix FTBFS + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Aug 2007 19:44:20 +0200 + +apt (0.7.6ubuntu6) gutsy; urgency=low + + * dpkg-triggers: Deal properly with new package states. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 15 Aug 2007 20:44:37 +0100 + +apt (0.7.6ubuntu5) UNRELEASED; urgency=low + + * apt-pkg/acquire-item.cc: + - fix file removal on local repo i-m-s hit (LP: #131166) + * tests/local-repo: + - added regression test for this bug + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Aug 2007 12:34:07 +0200 + +apt (0.7.6ubuntu4) gutsy; urgency=low + + * cmdline/apt-get.cc: + - remove YnPrompt when a XS-Vcs- tag is found, improve the + notice (LP: #129575) + * methods/copy.cc: + - take hashes here too + * apt-pkg/acquire-worker.cc: + - only pass on computed hash if we recived one from the method + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Aug 2007 19:30:29 +0200 + +apt (0.7.6ubuntu3) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix packagename extraction when writting apport reports + * apt-pkg/pkgcachegen.cc: + - increase default mmap size (LP: #125640) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Aug 2007 09:52:00 +0200 + +apt (0.7.6ubuntu2) gutsy; urgency=low + + * doc/examples/sources.list: + - change example source to gutsy + * apt-pkg/deb/dpkgpm.cc: + - do not break if no /dev/pts is available + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 06 Aug 2007 15:17:57 +0200 + +apt (0.7.6ubuntu1) gutsy; urgency=low + + [ Michael Vogt ] + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have a file + - send range request with if-range + - delete failed downloads + (thanks to Thom May for his help here) + - delete zero size I-M-S hits + * apt-pkg/deb/dpkgpm.{cc,h}: + - merged dpkg-log branch, this lets you specify a + Dir::Log::Terminal file to log dpkg output to + (ABI break) + - when writting apport reports, attach the dpkg + terminal log too + * merged apt--sha256 branch to fully support the new + sha256 checksums in the Packages and Release files + (ABI break) + * apt-pkg/pkgcachegen.cc: + - increase default mmap size + * tests/local-repo: + - added local repository testcase + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200 + apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong @@ -4993,6 +7274,14 @@ apt (0.7.5) unstable; urgency=low -- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300 +apt (0.7.4ubuntu1) gutsy; urgency=low + + * debian/apt.conf.ubuntu, apt.conf.autoremove: + - Change metapackages to {restricted,universe,multiverse}/metapackages + in Install-Recommends-Sections and Never-MarkAuto-Sections + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Jul 2007 10:42:29 +0200 + apt (0.7.4) unstable; urgency=low [ Michael Vogt ] @@ -5053,6 +7342,90 @@ apt (0.7.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200 +apt (0.7.2ubuntu7) gutsy; urgency=low + + * fix build-dependencies + * fixes in the auto-mark code (thanks to Daniel + Burrows) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200 + +apt (0.7.2ubuntu6) gutsy; urgency=low + + [ Michael Vogt] + * cmdline/apt-get.cc: + - make the XS-Vcs-$foo warning more copy'n'paste + friendly (thanks to Matt Zimmerman) + - ignore the Vcs-Browser tag (Fixes LP: #121770) + * debian/apt.conf.autoremove: + - added "linux-ubuntu-modules" to APT::NeverAutoRemove + + [ Sarah Hobbs ] + * Change metapackages to *metapackages in Install-Recommends-Section + and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that + the Recommends of metapackages in universe and multiverse will get + installed. + * Also make this change in doc/examples/configure-index. + * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, + docbook to fix FTBFS. + * Added in previous changelog entries, as those who uploaded did not + actually commit to Bzr. + + -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000 + +apt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000 + +apt (0.7.2ubuntu3) gutsy; urgency=low + + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200 + +apt (0.7.2ubuntu2) gutsy; urgency=low + + * fixed compile errors with g++ 4.3 (thanks to + Daniel Burrows, closes: #429378) + * fix FTFBFS by changing build-depends to + libcurl4-gnutls-dev (closes: #428363) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200 + +apt (0.7.2ubuntu1) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - apport integration added, this means that a apport + report is written on dpkg failures + * cmdline/apt-get.cc: + - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/ + this will warn when Vcs- headers are found on apt-get source + (Fixes LP:#115959) + * merged from debian/unstable, remaining changes: + - maintainer field changed + - merged the apt--mirror branch + http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/ + - apport reporting on package install/upgrade/remove failure + - support for "Originial-Maintainer" field + - merged apt--xs-vcs-bzr branch + (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/) + - use ubuntu archive keyring by default + - debian/apt.conf.autoremove + + install recommands for section "metapackages" + + do not mark direct dependencies of "metapackages" as autoremoved + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200 + apt (0.7.2-0.1) unstable; urgency=low * Non-maintainer upload. @@ -5175,6 +7548,116 @@ apt (0.7.0) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100 +apt (0.6.46.4ubuntu10) feisty; urgency=low + + * apt-pkg/depcache.cc: + - added "APT::Never-MarkAuto-Section" and consider dependencies + of packages in this section manual (LP#59893) + - ensure proper permissions in the extended_state file (LP#67037) + * debian/apt.conf.ubuntu: + - added APT::Never-MarkAuto-Section "metapackages" (LP#59893) + * cmdline/apt-get.cc: + - "apt-get install foo" on a already installed package foo will + clean the automatic installed flag (LP#72007) + - do not show packages already marked for removal as auto-installed + (LP#64493) + - applied patch to (optionally) hide the auto-remove information + (thanks to Frode M. Døving) (LP#69148) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100 + +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + - only umount if it was mounted by the method before + * cmdline/apt-get.cc: + - fix version output in autoremove list (LP#68941) + * apt-pkg/packagemanager.cc: + - do not spin 100% cpu in FixMissing() (LP#84476) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * doc/examples/configure-index: + - document APT::Acquire::Translation + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100 + +apt (0.6.46.4ubuntu8) feisty; urgency=low + + * fix segfault in the pkgRecords destructor + * Bump ABI version + * debian/control: + - make the libcurl3-gnutls-dev versionized (LP#86614) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100 + +apt (0.6.46.4ubuntu7) feisty; urgency=low + + * Merged the apt--mirror branch. This means that a new 'mirror' + method is available that will allow dynamic mirror updates. + The sources.list entry looks something like this: + "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" + + It also supports error reporting to a configurable url for mirror + problems/failures. + * Bump ABI version + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100 + +apt (0.6.46.4ubuntu6) feisty; urgency=low + + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/algorithms.cc: + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + - fix segfault (lp: #76530) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100 + +apt (0.6.46.4ubuntu5) feisty; urgency=low + + * added apt-transport-https package to provide a optional + https transport (apt-https spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100 + +apt (0.6.46.4ubuntu4) feisty; urgency=low + + * apt-pkg/algorithms.cc: + - only increase the score of installed applications if they + are not obsolete + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100 + +apt (0.6.46.4ubuntu3) feisty; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100 + +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + (thanks to Ian Jackson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100 + +apt (0.6.46.4ubuntu1) feisty; urgency=low + + * merged with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100 + apt (0.6.46.4-0.1) unstable; urgency=emergency * NMU @@ -5204,13 +7687,33 @@ apt (0.6.46.4) unstable; urgency=high -- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100 +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000 + +apt (0.6.46.3ubuntu1) feisty; urgency=low + + * doc/apt-get.8.xml: + - documented autoremove, thanks to Vladimír Lapá%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 <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100 + apt (0.6.46.3-0.2) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. * Fix FTBFS on most arches (regression from the fix of #400874) -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 15:51:22 +0000 - + apt (0.6.46.3-0.1) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. @@ -5316,6 +7819,173 @@ apt (0.6.46) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200 +apt (0.6.45ubuntu14) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200 + +apt (0.6.45ubuntu13) edgy; urgency=low + + * no-changes upload to make apt rebuild against latest g++ and + fix synaptic FTBFS (see bug: #62461 for details) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200 + +apt (0.6.45ubuntu12) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix in the sweep() code, set garbage flag for packages scheduled + for removal too + - do not change the autoFlag in MarkKeep(), this can lead to suprising + side effects + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200 + +apt (0.6.45ubuntu11) edgy; urgency=low + + * removed "installtask" and change it so that tasknames can be given + with "apt-get install taskname^" + * improve the writeStateFile() code + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200 + +apt (0.6.45ubuntu10) edgy; urgency=low + + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) + * methods/gzip.cc: + - don't hang when /var is full (closes: #341537), thanks to + Luis Rodrigo Gallardo Cruz for the patch + * doc/examples/sources.list: + - removed non-us.debian.org from the example (closes: #380030,#316196) + * Merged from Christian Perrier bzr branch: + * ro.po: Updated to 514t. Closes: #388402 + * dz.po: Updated to 514t. Closes: #388184 + * it.po: Fixed typos. Closes: #387812 + * ku.po: New kurdish translation. Closes: #387766 + * sk.po: Updated to 514t. Closes: #386851 + * ja.po: Updated to 514t. Closes: #386537 + * gl.po: Updated to 514t. Closes: #386397 + * fr.po: Updated to 516t. + * fi.po: Updated to 512t. Closes: #382702 + * share/archive-archive.gpg: + - removed the outdated amd64 and debian-2004 keys + * apt-pkg/tagfile.cc: + - applied patch from Jeroen van Wolffelaar to make the tags + caseinsensitive (closes: #384182) + - reverted MMap use in the tagfile because it does not work + across pipes (closes: #383487) + * added "installtask" command + * added new ubuntu specific rewrite rule for "Original-Maintainer" + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200 + +apt (0.6.45ubuntu9) edgy; urgency=low + + * cmdline/apt-get.cc: + - if --no-remove is given, do not run the AutoRemove code + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200 + +apt (0.6.45ubuntu8) edgy; urgency=low + + * apt-pkg/algorithm.cc: + - fix pkgProblemResolver.InstallProtect() to preserve the auto-install + information (lp: #59457) + * cmdline/apt-get.cc: + - fix typo in autoremove information (lp: #59420) + * install apt-mark to modify the automatically install information for + packages + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200 + +apt (0.6.45ubuntu7) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix a bug in the install-recommends-section code + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200 + +apt (0.6.45ubuntu6) edgy; urgency=low + + [Michael Vogt] + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them + * debian/apt.conf.ubuntu: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed + - added "metapackages" as the section we want to install recommends + by default + * apt-pkg/depcache.cc: + - added support to turn install-recommends selectively on/off by + section + [Ian Jackson] + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + * Don't depend on or suggest any particular dpkg or dpkg-dev versions; + --auto-deconfigure is very very old and dpkg-dev's Breaks support + is more or less orthogonal. + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200 + +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200 + +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200 + +apt (0.6.45ubuntu3) edgy; urgency=low + + * ABI break + * merged latest apt--install-recommends (closes: #559000) + * added "--fix-policy" option to can be used as "--fix-broken" and + will install missing weak depends (recommends, and/or suggests + depending on the settings) + * merged the apt--ddtp branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200 + +apt (0.6.45ubuntu2) edgy; urgency=low + + * debian/control: + - switched to libdb4.4 for building (closes: #381019) + * cmdline/apt-get.cc: + - show only the recommends/suggests for the candidate-version, not for all + versions of the package (closes: #257054) + - properly handle recommends/suggests or-groups when printing the list of + suggested/recommends packages (closes: #311619) + * merged "apt--install-recommends" branch: + - added "{no-}install-recommends" commandline option + - added APT::Install-{Recommends,Suggests} option + - currently Install-Recommends defaults to "False" + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200 + +apt (0.6.45ubuntu1) edgy; urgency=low + + * merged with debian/unstable + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200 + apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: @@ -5361,6 +8031,37 @@ apt (0.6.45) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200 +apt (0.6.44.2ubuntu4) edgy; urgency=low + + * Make apt-get dselect-upgrade happy again + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200 + +apt (0.6.44.2ubuntu3) edgy; urgency=low + + * Close extended_states file after writing it. + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100 + +apt (0.6.44.2ubuntu2) edgy; urgency=low + + * create a empty extended_states file if none exists already + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200 + +apt (0.6.44.2ubuntu1) edgy; urgency=low + + * merged with debian/unstable + * merged the "auto-mark" branch to support aptitude like + marking of automatically installed dependencies and added + "apt-get remove --auto-remove" to remove unused auto-installed + packages again + * changed library version from 3.11 to 3.50 to make it clearly + different from the debian version (we are ABI incompatible because + of the auto-mark patch) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200 + apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions @@ -5449,6 +8150,26 @@ apt (0.6.44) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 +apt (0.6.43.3ubuntu3) dapper; urgency=low + + * methods/http.cc: + - fix the user-agent string + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200 + +apt (0.6.43.3ubuntu2) dapper; urgency=low + + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200 + +apt (0.6.43.3ubuntu1) dapper; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in + the status-fd (ubuntu #28954) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@ -5481,6 +8202,38 @@ apt (0.6.43.3) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 +apt (0.6.43.2ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100 + apt (0.6.43.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: @@ -5504,6 +8257,24 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100 +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: @@ -5527,6 +8298,19 @@ apt (0.6.43.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100 + apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@ -5547,6 +8331,22 @@ apt (0.6.43) unstable; urgency=medium -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 +apt (0.6.42.3ubuntu2) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@ -5575,7 +8375,7 @@ apt (0.6.42.2) unstable; urgency=high * Priority high to get the AMD key into testing ASAP. -- Frans Pop <fjp@debian.org> Sun, 30 Oct 2005 21:29:11 +0100 - + apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page @@ -5653,6 +8453,80 @@ apt (0.6.41) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 +apt (0.6.40.1ubuntu8) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: + - fix for a bad memory/file leak in the mmap code (ubuntu #15603) + * po/de.po, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200 + +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200 + +apt (0.6.40.1ubuntu2) breezy; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200 + apt (0.6.40.1) unstable; urgency=low * bugfix in the parsing code for the apt<->dpkg communication. apt @@ -5662,6 +8536,12 @@ apt (0.6.40.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@ -5677,6 +8557,39 @@ apt (0.6.40) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -5689,6 +8602,13 @@ apt (0.6.39) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700 +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround @@ -7567,3 +10487,4 @@ apt (0.0.1) unstable; urgency=low * Initial Release. -- Scott K. Ellis <scott@debian.org> Tue, 31 Mar 1998 12:49:28 -0500 + diff --git a/debian/control b/debian/control index 84d6155a6..9b5e4ced2 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,9 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team <deity@lists.debian.org> -Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> +Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, @@ -17,7 +18,7 @@ XS-Testsuite: autopkgtest Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg +Depends: ${shlibs:Depends}, ${misc:Depends}, ubuntu-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) diff --git a/debian/gbp.conf b/debian/gbp.conf index db22e3e1e..a9da2423b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,5 +2,5 @@ prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build export-dir = ../build-area -debian-branch = debian/sid +debian-branch = ubuntu/master debian-tag = %(version)s diff --git a/debian/rules b/debian/rules index 06ccdac31..043f5647b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. +# build in verbose mode by default to make it easy to diangose issues +export NOISY=1 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -183,6 +186,8 @@ apt: build-binary build-manpages debian/apt.install # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 6a36d08ca..9d51f4f7b 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -130,7 +130,7 @@ 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. </para> @@ -180,12 +180,12 @@ <listitem><para>Local trust database of archive keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term> - <listitem><para>Keyring of Debian archive trusted keys.</para></listitem> + <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term> + <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term> - <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem> + <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term> + <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem> </varlistentry> </variablelist> diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in index 745e32cbe..00db2f8cd 100644 --- a/doc/examples/sources.list.in +++ b/doc/examples/sources.list.in @@ -1,8 +1,10 @@ # See sources.list(5) manpage for more information # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free -deb http://security.debian.org &stable-codename;/updates main contrib non-free +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted -# Uncomment if you want the apt-get source function to work -#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free -#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted diff --git a/doc/makefile b/doc/makefile index 274fbc278..266caa990 100644 --- a/doc/makefile +++ b/doc/makefile @@ -13,7 +13,7 @@ include $(DEBIANDOC_H) doc: manpages debiandoc examples/sources.list: examples/sources.list.in apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list + sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list # Examples SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 43c184106..85368895d 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.8.1\n" +"Project-Id-Version: apt-doc 0.9.9ubuntu1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1110,7 +1110,7 @@ msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 +#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 msgid "See Also" msgstr "" @@ -1123,7 +1123,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 +#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "" @@ -1620,8 +1620,8 @@ msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1670,22 +1670,22 @@ 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> @@ -2060,13 +2060,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: " +"<literal>Acquire::cdrom::AutoDetect</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 +msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2074,7 +2082,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: " @@ -2082,7 +2090,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2091,7 +2099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2099,7 +2107,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2107,12 +2115,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." diff --git a/doc/po/de.po b/doc/po/de.po index 8ecbf4cbf..48804dd4c 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -763,9 +763,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1549,7 +1549,7 @@ msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1569,7 +1569,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnose" @@ -2261,12 +2261,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen " @@ -2335,24 +2342,33 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel" #. 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" @@ -2879,6 +2895,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser " +"Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und " +"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::" +"cdrom::mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2890,7 +2923,7 @@ msgstr "" "cdrom::mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2902,7 +2935,7 @@ msgstr "" "Konfigurationselement: <literal>APT::CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2913,7 +2946,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2926,7 +2959,7 @@ msgstr "" "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2937,7 +2970,7 @@ msgstr "" "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2948,12 +2981,12 @@ msgstr "" "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3787,12 +3820,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " -"wird standardmäßig in der Form <literal>http://[[Anwender][:" -"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " -"außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " -"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " -"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " -"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." +"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" +"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " +"der Form <literal>http::Proxy::<host></literal> mit dem speziellen " +"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " +"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " +"die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:366 @@ -5031,15 +5064,15 @@ msgstr "" "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " -"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " -"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " -"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " -"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " -"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " -"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " -"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " -"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " -"dem das Paket erscheint." +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" +"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " +"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " +"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " +"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" +"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " +"oder wenn sie die gleiche Version haben, wie die, die installiert ist. " +"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " +"erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1061 @@ -6284,9 +6317,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " -"type=\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:584 @@ -6367,9 +6400,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " -"type=\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@ -6472,8 +6505,8 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" +"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -6641,13 +6674,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " @@ -8166,9 +8199,9 @@ msgstr "BESCHREIBUNG" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@ -8753,9 +8786,9 @@ msgstr "" "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " -"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " -"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " -"update</tt> ausgeführt wurde." +"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" +"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" +"tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --git a/doc/po/es.po b/doc/po/es.po index 38b2645ea..b4f90bbe6 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -848,9 +848,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1625,7 +1625,7 @@ msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1645,7 +1645,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnósticos" @@ -2330,12 +2330,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 "" "Actualiza el registro de claves local con el registro de claves del archivo " "y elimina del registro local las claves de archivo que ya no son válidas. El " @@ -2404,24 +2411,33 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml: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> @@ -2943,6 +2959,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Punto de montaje. Define el lugar donde se debe montar el disco óptico. El " +"punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar " +"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::" +"mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2954,7 +2987,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2966,7 +2999,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2976,7 +3009,7 @@ msgstr "" "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2989,7 +3022,7 @@ msgstr "" "de configuración: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -3001,7 +3034,7 @@ msgstr "" "pero encontrará todo el contenido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -3012,12 +3045,12 @@ msgstr "" "CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6664,18 +6697,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." -msgstr "" -"<literal>distribución</literal> puede contener una variable, <literal>" -"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " -"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " -"Esto permite que los ficheros <filename>sources.list</filename> sean " +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." +msgstr "" +"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" +"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " +"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " +"permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@ -8179,9 +8212,9 @@ msgstr "DESCRIPCIÓN" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@ -8751,9 +8784,9 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" -"Es necesario actualizar la lista disponible mediante el elemento de menú " -"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " -"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" +"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " +"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --git a/doc/po/fr.po b/doc/po/fr.po index c2f4b6d83..286a20db7 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -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: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -760,9 +760,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -824,10 +824,10 @@ msgstr "" "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " -"« install » n'installera la nouvelle version que pour le(s) paquet(s) " -"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " -"si une nouvelle version est disponible, cette version (et ses dépendances, " -"comme décrit plus haut) sera récupérée et installée." +"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" +"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " +"nouvelle version est disponible, cette version (et ses dépendances, comme " +"décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:137 @@ -1544,7 +1544,7 @@ msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1564,7 +1564,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostics" @@ -2257,12 +2257,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 "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de " @@ -2331,24 +2338,33 @@ msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml: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> @@ -2867,6 +2883,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Point de montage ; spécifie l'emplacement de montage du CD. Ce point de " +"montage doit être spécifié dans <filename>/etc/fstab</filename> et " +"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::" +"mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2878,7 +2911,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2890,7 +2923,7 @@ msgstr "" "<literal>APT::CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2901,7 +2934,7 @@ msgstr "" "NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2915,7 +2948,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2927,7 +2960,7 @@ msgstr "" "le CD mais tous les paquets seront repérés." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2938,12 +2971,12 @@ msgstr "" "<literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6612,13 +6645,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> peut aussi contenir une variable <literal>" "$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme " @@ -8122,9 +8155,9 @@ msgstr "DESCRIPTION" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@ -8738,11 +8771,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" -"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " -"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " -"pour les installer. Lorsque la méthode APT est utilisée, les options " -"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " -"fait l'ensemble des opérations." +"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" +"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " +"les installer. Lorsque la méthode APT est utilisée, les options « [C]" +"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " +"l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --git a/doc/po/it.po b/doc/po/it.po index df144e2b7..2d432c6cc 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -812,9 +812,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1588,7 +1588,7 @@ msgstr "File" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1608,7 +1608,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostica" @@ -2296,12 +2296,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 "" "Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove " "dal portachiavi locale le chiavi di archivio che non sono più valide. Il " @@ -2370,24 +2377,33 @@ msgstr "Database locale di fiducia delle chiavi archiviate." #. 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 "Portachiavi delle chiavi fidate degli archivi 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 "Portachiavi delle chiavi fidate rimosse degli archivi Debian." #. type: Content of: <refentry><refsect1><para> @@ -2910,6 +2926,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo " +"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> " +"e configurato correttamente. Voce di configurazione: <literal>Acquire::" +"cdrom::mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2921,7 +2954,7 @@ msgstr "" "cdrom::mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2933,7 +2966,7 @@ msgstr "" "Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2944,7 +2977,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2957,7 +2990,7 @@ msgstr "" "errore. Voce di configurazione: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2969,7 +3002,7 @@ msgstr "" "più tempo, ma troverà tutti i file." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2980,12 +3013,12 @@ msgstr "" "<literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6647,13 +6680,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribuzione</literal> può anche contenere una variabile <literal>" "$(ARCH)</literal> che viene espansa nell'architettura Debian (come " @@ -8148,9 +8181,9 @@ msgstr "DESCRIZIONE" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@ -8204,8 +8237,8 @@ msgid "" "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " -"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " -"B<reportbug>(1)." +"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" +"(1)." #. type: SH #: apt.8:51 diff --git a/doc/po/ja.po b/doc/po/ja.po index 6b767f195..659f8c77b 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -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: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -800,9 +800,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1536,7 +1536,7 @@ msgstr "ファイル" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1556,7 +1556,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "診断メッセージ" @@ -2215,12 +2215,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 "" "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ" "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の" @@ -2287,24 +2294,33 @@ 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> #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><para> @@ -2810,6 +2826,22 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン" +"トは、<filename>/etc/fstab</filename> に正しく設定されている必要があります。" +"設定項目: <literal>Acquire::cdrom::mount</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2820,7 +2852,7 @@ msgstr "" "設定項目: <literal>Acquire::cdrom::mount</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2831,7 +2863,7 @@ msgstr "" "を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2842,7 +2874,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2855,7 +2887,7 @@ msgstr "" "<literal>APT::CDROM::Fast</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2867,7 +2899,7 @@ msgstr "" "できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2878,12 +2910,12 @@ msgstr "" "CDROM::NoAct</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3823,10 +3855,10 @@ msgstr "" "るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" "る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ" "ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ" -"い。URI を構成するコンポーネントに対応する置換変数は、<literal>" -"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" -"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" -"literal>, <literal>$(SITE_PORT)</literal> です。" +"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)" +"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</" +"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, " +"<literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:451 @@ -6360,13 +6392,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合" "があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian " @@ -7816,14 +7848,14 @@ msgstr "説明" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため" -"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の " -"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか" -"のオプションは B<apt-get>(8) にしか実装されていません。" +"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>" +"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ" +"ンは B<apt-get>(8) にしか実装されていません。" #. type: SH #: apt.8:31 diff --git a/doc/po/pl.po b/doc/po/pl.po index 2b33324b6..b89d992a0 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -811,9 +811,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1619,7 +1619,7 @@ msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1640,7 +1640,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostyka" @@ -2362,12 +2362,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 "" "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i " "usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy " @@ -2436,24 +2443,33 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum." #. 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> @@ -2978,6 +2994,24 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany " +"CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w " +"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: " +"<literal>Acquire::cdrom::mount</literal>." + +# +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2990,7 +3024,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -3003,7 +3037,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -3015,7 +3049,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -3030,7 +3064,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -3043,7 +3077,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -3055,13 +3089,13 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" # #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6083,13 +6117,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</" "literal>, która zostanie rozwinięta do architektury Debiana (takiej jak " @@ -7398,9 +7432,9 @@ msgstr "OPIS" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek " "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), " @@ -7686,8 +7720,8 @@ msgstr "" "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw " "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</" "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest " -"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources." -"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " +"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list" +"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " "pomocą polecenia <tt>apt-get update</tt>. Na przykład:" #. type: <example></example> diff --git a/doc/po/pt.po b/doc/po/pt.po index 726b184d0..9342b2fda 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+0300\n" "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <l10n@debianpt.org>\n" @@ -809,9 +809,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1572,7 +1572,7 @@ msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1592,7 +1592,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnóstico" @@ -2276,12 +2276,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 "" "Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro " "local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é " @@ -2349,24 +2356,33 @@ msgstr "Base de dados local de confiança de chaves de arquivos." #. 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> @@ -2887,6 +2903,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 +#, fuzzy +#| msgid "" +#| "Mount point; specify the location to mount the CD-ROM. This mount point " +#| "must be listed in <filename>/etc/fstab</filename> and properly " +#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" +"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto " +"de montagem deve estar listado em <filename>/etc/fstab</filename> e " +"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::" +"mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2898,7 +2931,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2910,7 +2943,7 @@ msgstr "" "CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2921,7 +2954,7 @@ msgstr "" "NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2934,7 +2967,7 @@ msgstr "" "configuração: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2945,7 +2978,7 @@ msgstr "" "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2956,12 +2989,12 @@ msgstr "" "configuração: <literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3776,12 +3809,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> define o proxy http predefinido a usar para " -"URIs de HTTP. Está no formato standard de <literal>http://[[user][:" -"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por " -"máquina ao usar o formato <literal>http::Proxy::<host></literal> com a " -"palavra chave especial <literal>DIRECT</literal> que significa não usar " -"proxies. Se nenhuma das definições acima for especificada, será usada a " -"variável de ambiente <envar>http_proxy</envar>." +"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]" +"host[:port]/</literal>. Também podem ser especificados proxies por máquina " +"ao usar o formato <literal>http::Proxy::<host></literal> com a palavra " +"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se " +"nenhuma das definições acima for especificada, será usada a variável de " +"ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:366 @@ -3954,9 +3987,8 @@ msgstr "" "servidor proxy ao que se ligar. Por favor veja &configureindex; para um " "exemplo de como fazer isto. As variáveis de substituição que representam o " "componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>" -"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" -"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</" -"literal>." +"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)" +"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:451 @@ -6584,13 +6616,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> também pode conter uma variável. <literal>" "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como " @@ -8087,9 +8119,9 @@ msgstr "DESCRIÇÃO" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT é um sistema de gestão para pacotes de software. Para a gestão de " "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " @@ -8368,11 +8400,11 @@ msgid "" "instance," msgstr "" "O primeira <footnote><p>se você está a usar um servidor proxy http você tem " -"que definir a variável de ambiente http_proxy primeiro, veja sources." -"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</" -"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que " -"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get " -"update</tt>. Por exemplo," +"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" +"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> " +"é obter as listas de pacotes a partir das <em>Sources</em> para que ele " +"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</" +"tt>. Por exemplo," #. type: <example></example> #: guide.sgml:116 diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 00619cd22..7b105cf47 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -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: 2013-06-13 13:46+0300\n" +"POT-Creation-Date: 2013-07-02 17:09+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" @@ -586,9 +586,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). 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 " +"product-version;_amd64.deb</filename>). 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 " @@ -1097,7 +1097,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1115,7 +1115,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "" @@ -1618,8 +1618,8 @@ msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1669,23 +1669,23 @@ 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> @@ -2061,13 +2061,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 msgid "" +"Do not try to auto-detect the CD-ROM path. Usually combined with the " +"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" +"cdrom::AutoDetect</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:93 +msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:94 +#: apt-cdrom.8.xml:102 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2075,7 +2083,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:103 +#: apt-cdrom.8.xml:111 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2083,7 +2091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:119 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2092,7 +2100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:121 +#: apt-cdrom.8.xml:129 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2100,7 +2108,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:132 +#: apt-cdrom.8.xml:140 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2108,13 +2116,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:145 +#: apt-cdrom.8.xml:153 #, fuzzy msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:150 +#: apt-cdrom.8.xml:158 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -4839,8 +4847,8 @@ msgid "" "id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; adequado e o arquivo de preferências do APT " -"acima, quaisquer dos comandos a seguir farão com que o APT atualize para " -"a(s) última(s) versão(ões) <literal>testing</literal>." +"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a" +"(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@ -5060,13 +5068,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6187,9 +6195,9 @@ msgstr "" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" #. type: SH diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 1288ff133..4db6e8e7a 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { @@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { diff --git a/po/apt-all.pot b/po/apt-all.pot new file mode 100644 index 000000000..888dddcc6 --- /dev/null +++ b/po/apt-all.pot @@ -0,0 +1,3193 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: apt 0.9.9ubuntu1\n" +"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +"POT-Creation-Date: 2013-07-02 17:10+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmdline/apt-cache.cc:158 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "" + +#: cmdline/apt-cache.cc:286 +msgid "Total package names: " +msgstr "" + +#: cmdline/apt-cache.cc:288 +msgid "Total package structures: " +msgstr "" + +#: cmdline/apt-cache.cc:328 +msgid " Normal packages: " +msgstr "" + +#: cmdline/apt-cache.cc:329 +msgid " Pure virtual packages: " +msgstr "" + +#: cmdline/apt-cache.cc:330 +msgid " Single virtual packages: " +msgstr "" + +#: cmdline/apt-cache.cc:331 +msgid " Mixed virtual packages: " +msgstr "" + +#: cmdline/apt-cache.cc:332 +msgid " Missing: " +msgstr "" + +#: cmdline/apt-cache.cc:334 +msgid "Total distinct versions: " +msgstr "" + +#: cmdline/apt-cache.cc:336 +msgid "Total distinct descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:338 +msgid "Total dependencies: " +msgstr "" + +#: cmdline/apt-cache.cc:341 +msgid "Total ver/file relations: " +msgstr "" + +#: cmdline/apt-cache.cc:343 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:345 +msgid "Total Provides mappings: " +msgstr "" + +#: cmdline/apt-cache.cc:357 +msgid "Total globbed strings: " +msgstr "" + +#: cmdline/apt-cache.cc:371 +msgid "Total dependency version space: " +msgstr "" + +#: cmdline/apt-cache.cc:376 +msgid "Total slack space: " +msgstr "" + +#: cmdline/apt-cache.cc:384 +msgid "Total space accounted for: " +msgstr "" + +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#, c-format +msgid "Package file %s is out of sync." +msgstr "" + +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 +msgid "No packages found" +msgstr "" + +#: cmdline/apt-cache.cc:1243 +msgid "You must give at least one search pattern" +msgstr "" + +#: cmdline/apt-cache.cc:1401 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +msgstr "" + +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#, c-format +msgid "Unable to locate package %s" +msgstr "" + +#: cmdline/apt-cache.cc:1526 +msgid "Package files:" +msgstr "" + +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1547 +msgid "Pinned packages:" +msgstr "" + +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +msgid "(not found)" +msgstr "" + +#: cmdline/apt-cache.cc:1567 +msgid " Installed: " +msgstr "" + +#: cmdline/apt-cache.cc:1568 +msgid " Candidate: " +msgstr "" + +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +msgid "(none)" +msgstr "" + +#: cmdline/apt-cache.cc:1601 +msgid " Package pin: " +msgstr "" + +#. Show the priority tables +#: cmdline/apt-cache.cc:1610 +msgid " Version table:" +msgstr "" + +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 +#, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "" + +#: cmdline/apt-cache.cc:1730 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\n" +"\n" +"Commands:\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" + +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:100 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" + +#: cmdline/apt-cdrom.cc:135 +#, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "" + +#: cmdline/apt-cdrom.cc:170 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + +#: cmdline/apt-config.cc:46 +msgid "Arguments not in pairs" +msgstr "" + +#: cmdline/apt-config.cc:87 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: cmdline/apt-get.cc:135 +msgid "Y" +msgstr "" + +#: cmdline/apt-get.cc:140 +msgid "N" +msgstr "" + +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#, c-format +msgid "Regex compilation error - %s" +msgstr "" + +#: cmdline/apt-get.cc:260 +msgid "The following packages have unmet dependencies:" +msgstr "" + +#: cmdline/apt-get.cc:350 +#, c-format +msgid "but %s is installed" +msgstr "" + +#: cmdline/apt-get.cc:352 +#, c-format +msgid "but %s is to be installed" +msgstr "" + +#: cmdline/apt-get.cc:359 +msgid "but it is not installable" +msgstr "" + +#: cmdline/apt-get.cc:361 +msgid "but it is a virtual package" +msgstr "" + +#: cmdline/apt-get.cc:364 +msgid "but it is not installed" +msgstr "" + +#: cmdline/apt-get.cc:364 +msgid "but it is not going to be installed" +msgstr "" + +#: cmdline/apt-get.cc:369 +msgid " or" +msgstr "" + +#: cmdline/apt-get.cc:398 +msgid "The following NEW packages will be installed:" +msgstr "" + +#: cmdline/apt-get.cc:424 +msgid "The following packages will be REMOVED:" +msgstr "" + +#: cmdline/apt-get.cc:446 +msgid "The following packages have been kept back:" +msgstr "" + +#: cmdline/apt-get.cc:467 +msgid "The following packages will be upgraded:" +msgstr "" + +#: cmdline/apt-get.cc:488 +msgid "The following packages will be DOWNGRADED:" +msgstr "" + +#: cmdline/apt-get.cc:508 +msgid "The following held packages will be changed:" +msgstr "" + +#: cmdline/apt-get.cc:563 +#, c-format +msgid "%s (due to %s) " +msgstr "" + +#: cmdline/apt-get.cc:571 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" + +#: cmdline/apt-get.cc:602 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "" + +#: cmdline/apt-get.cc:606 +#, c-format +msgid "%lu reinstalled, " +msgstr "" + +#: cmdline/apt-get.cc:608 +#, c-format +msgid "%lu downgraded, " +msgstr "" + +#: cmdline/apt-get.cc:610 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "" + +#: cmdline/apt-get.cc:614 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "" + +#: cmdline/apt-get.cc:635 +#, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:640 +#, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:657 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "" + +#: cmdline/apt-get.cc:668 +msgid " [Installed]" +msgstr "" + +#: cmdline/apt-get.cc:677 +msgid " [Not candidate version]" +msgstr "" + +#: cmdline/apt-get.cc:679 +msgid "You should explicitly select one to install." +msgstr "" + +#: cmdline/apt-get.cc:682 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" + +#: cmdline/apt-get.cc:700 +msgid "However the following packages replace it:" +msgstr "" + +#: cmdline/apt-get.cc:712 +#, c-format +msgid "Package '%s' has no installation candidate" +msgstr "" + +#: cmdline/apt-get.cc:725 +#, c-format +msgid "Virtual packages like '%s' can't be removed\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "" + +#: cmdline/apt-get.cc:788 +#, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:818 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" + +#: cmdline/apt-get.cc:822 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: cmdline/apt-get.cc:834 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#: cmdline/apt-get.cc:839 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "" + +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:1025 +msgid "Correcting dependencies..." +msgstr "" + +#: cmdline/apt-get.cc:1028 +msgid " failed." +msgstr "" + +#: cmdline/apt-get.cc:1031 +msgid "Unable to correct dependencies" +msgstr "" + +#: cmdline/apt-get.cc:1034 +msgid "Unable to minimize the upgrade set" +msgstr "" + +#: cmdline/apt-get.cc:1036 +msgid " Done" +msgstr "" + +#: cmdline/apt-get.cc:1040 +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "" + +#: cmdline/apt-get.cc:1043 +msgid "Unmet dependencies. Try using -f." +msgstr "" + +#: cmdline/apt-get.cc:1068 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "" + +#: cmdline/apt-get.cc:1072 +msgid "Authentication warning overridden.\n" +msgstr "" + +#: cmdline/apt-get.cc:1079 +msgid "Install these packages without verification [y/N]? " +msgstr "" + +#: cmdline/apt-get.cc:1081 +msgid "Some packages could not be authenticated" +msgstr "" + +#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +msgid "There are problems and -y was used without --force-yes" +msgstr "" + +#: cmdline/apt-get.cc:1131 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" + +#: cmdline/apt-get.cc:1140 +msgid "Packages need to be removed but remove is disabled." +msgstr "" + +#: cmdline/apt-get.cc:1151 +msgid "Internal error, Ordering didn't finish" +msgstr "" + +#: cmdline/apt-get.cc:1189 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1196 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1208 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1213 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "" + +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "" + +#: cmdline/apt-get.cc:1241 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "" + +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" + +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 +msgid "Yes, do as I say!" +msgstr "" + +#: cmdline/apt-get.cc:1263 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" + +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +msgid "Abort." +msgstr "" + +#: cmdline/apt-get.cc:1284 +msgid "Do you want to continue [Y/n]? " +msgstr "" + +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1566 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "" + +#: cmdline/apt-get.cc:1374 +msgid "Some files failed to download" +msgstr "" + +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +msgid "Download complete and in download only mode" +msgstr "" + +#: cmdline/apt-get.cc:1381 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" + +#: cmdline/apt-get.cc:1385 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" + +#: cmdline/apt-get.cc:1390 +msgid "Unable to correct missing packages." +msgstr "" + +#: cmdline/apt-get.cc:1391 +msgid "Aborting install." +msgstr "" + +#: cmdline/apt-get.cc:1419 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" + +#: cmdline/apt-get.cc:1423 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" + +#: cmdline/apt-get.cc:1561 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1593 +#, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "" + +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1631 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1647 +msgid "The update command takes no arguments" +msgstr "" + +#: cmdline/apt-get.cc:1713 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1817 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1824 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1831 +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "" +msgstr[1] "" + +#: cmdline/apt-get.cc:1835 +#, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "" +msgstr[1] "" + +#: cmdline/apt-get.cc:1837 +msgid "Use 'apt-get autoremove' to remove it." +msgid_plural "Use 'apt-get autoremove' to remove them." +msgstr[0] "" +msgstr[1] "" + +#: cmdline/apt-get.cc:1856 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1955 +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "" + +#: cmdline/apt-get.cc:1959 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" + +#: cmdline/apt-get.cc:1973 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" + +#: cmdline/apt-get.cc:1994 +msgid "Broken packages" +msgstr "" + +#: cmdline/apt-get.cc:2020 +msgid "The following extra packages will be installed:" +msgstr "" + +#: cmdline/apt-get.cc:2110 +msgid "Suggested packages:" +msgstr "" + +#: cmdline/apt-get.cc:2111 +msgid "Recommended packages:" +msgstr "" + +#: cmdline/apt-get.cc:2153 +#, c-format +msgid "Couldn't find package %s" +msgstr "" + +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#, c-format +msgid "%s set to automatically installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" + +#: cmdline/apt-get.cc:2184 +msgid "Calculating upgrade... " +msgstr "" + +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +msgid "Failed" +msgstr "" + +#: cmdline/apt-get.cc:2192 +msgid "Done" +msgstr "" + +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +msgid "Internal error, problem resolver broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +msgid "Unable to lock the download directory" +msgstr "" + +#: cmdline/apt-get.cc:2387 +#, c-format +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" + +#: cmdline/apt-get.cc:2392 +#, c-format +msgid "Downloading %s %s" +msgstr "" + +#: cmdline/apt-get.cc:2452 +msgid "Must specify at least one package to fetch source for" +msgstr "" + +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "" + +#: cmdline/apt-get.cc:2509 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2514 +#, c-format +msgid "" +"Please use:\n" +"bzr branch %s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2567 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:2604 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2613 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2618 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "" + +#: cmdline/apt-get.cc:2624 +#, c-format +msgid "Fetch source %s\n" +msgstr "" + +#: cmdline/apt-get.cc:2662 +msgid "Failed to fetch some archives." +msgstr "" + +#: cmdline/apt-get.cc:2693 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "" + +#: cmdline/apt-get.cc:2705 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "" + +#: cmdline/apt-get.cc:2706 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:2728 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "" + +#: cmdline/apt-get.cc:2748 +msgid "Child process failed" +msgstr "" + +#: cmdline/apt-get.cc:2767 +msgid "Must specify at least one package to check builddeps for" +msgstr "" + +#: cmdline/apt-get.cc:2792 +#, c-format +msgid "" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" +msgstr "" + +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "" + +#: cmdline/apt-get.cc:2839 +#, c-format +msgid "%s has no build depends.\n" +msgstr "" + +#: cmdline/apt-get.cc:3009 +#, c-format +msgid "" +"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " +"packages" +msgstr "" + +#: cmdline/apt-get.cc:3027 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" + +#: cmdline/apt-get.cc:3050 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" + +#: cmdline/apt-get.cc:3089 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because candidate version of " +"package %s can't satisfy version requirements" +msgstr "" + +#: cmdline/apt-get.cc:3095 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because package %s has no candidate " +"version" +msgstr "" + +#: cmdline/apt-get.cc:3118 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "" + +#: cmdline/apt-get.cc:3133 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "" + +#: cmdline/apt-get.cc:3138 +msgid "Failed to process build dependencies" +msgstr "" + +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#, c-format +msgid "Changelog for %s (%s)" +msgstr "" + +#: cmdline/apt-get.cc:3369 +msgid "Supported modules:" +msgstr "" + +#: cmdline/apt-get.cc:3410 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove automatically all unused packages\n" +" purge - Remove packages and config files\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to correct a system with broken dependencies in place\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" + +#: cmdline/apt-get.cc:3575 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + +#: cmdline/acqprogress.cc:60 +msgid "Hit " +msgstr "" + +#: cmdline/acqprogress.cc:84 +msgid "Get:" +msgstr "" + +#: cmdline/acqprogress.cc:115 +msgid "Ign " +msgstr "" + +#: cmdline/acqprogress.cc:119 +msgid "Err " +msgstr "" + +#: cmdline/acqprogress.cc:140 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "" + +#: cmdline/acqprogress.cc:230 +#, c-format +msgid " [Working]" +msgstr "" + +#: cmdline/acqprogress.cc:286 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" + +#: cmdline/apt-mark.cc:55 +#, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:61 +#, c-format +msgid "%s was already set to manually installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:63 +#, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:228 +#, c-format +msgid "%s was already set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:230 +#, c-format +msgid "%s was already not hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1001 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "" + +#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309 +#, c-format +msgid "%s set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 +#, c-format +msgid "Canceled hold on %s.\n" +msgstr "" + +#: cmdline/apt-mark.cc:332 +msgid "Executing dpkg failed. Are you root?" +msgstr "" + +#: cmdline/apt-mark.cc:379 +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manually or automatically installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." +msgstr "" + +#: methods/cdrom.cc:203 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "" + +#: methods/cdrom.cc:212 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" + +#: methods/cdrom.cc:222 +msgid "Wrong CD-ROM" +msgstr "" + +#: methods/cdrom.cc:249 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "" + +#: methods/cdrom.cc:254 +msgid "Disk not found." +msgstr "" + +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +msgid "File not found" +msgstr "" + +#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 +#: methods/rred.cc:512 methods/rred.cc:521 +msgid "Failed to stat" +msgstr "" + +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +msgid "Failed to set modification time" +msgstr "" + +#: methods/file.cc:47 +msgid "Invalid URI, local URIS must not start with //" +msgstr "" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:173 +msgid "Logging in" +msgstr "" + +#: methods/ftp.cc:179 +msgid "Unable to determine the peer name" +msgstr "" + +#: methods/ftp.cc:184 +msgid "Unable to determine the local name" +msgstr "" + +#: methods/ftp.cc:215 methods/ftp.cc:243 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "" + +#: methods/ftp.cc:221 +#, c-format +msgid "USER failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:228 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:248 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" + +#: methods/ftp.cc:276 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:302 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +msgid "Connection timeout" +msgstr "" + +#: methods/ftp.cc:346 +msgid "Server closed the connection" +msgstr "" + +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1283 +#: apt-pkg/contrib/fileutl.cc:1292 apt-pkg/contrib/fileutl.cc:1295 +msgid "Read error" +msgstr "" + +#: methods/ftp.cc:356 methods/rsh.cc:206 +msgid "A response overflowed the buffer." +msgstr "" + +#: methods/ftp.cc:373 methods/ftp.cc:385 +msgid "Protocol corruption" +msgstr "" + +#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 +#: apt-pkg/contrib/fileutl.cc:1379 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1391 apt-pkg/contrib/fileutl.cc:1416 +msgid "Write error" +msgstr "" + +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +msgid "Could not create a socket" +msgstr "" + +#: methods/ftp.cc:707 +msgid "Could not connect data socket, connection timed out" +msgstr "" + +#: methods/ftp.cc:713 +msgid "Could not connect passive socket." +msgstr "" + +#: methods/ftp.cc:730 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "" + +#: methods/ftp.cc:744 +msgid "Could not bind a socket" +msgstr "" + +#: methods/ftp.cc:748 +msgid "Could not listen on the socket" +msgstr "" + +#: methods/ftp.cc:755 +msgid "Could not determine the socket's name" +msgstr "" + +#: methods/ftp.cc:787 +msgid "Unable to send PORT command" +msgstr "" + +#: methods/ftp.cc:797 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "" + +#: methods/ftp.cc:806 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:826 +msgid "Data socket connect timed out" +msgstr "" + +#: methods/ftp.cc:833 +msgid "Unable to accept connection" +msgstr "" + +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +msgid "Problem hashing file" +msgstr "" + +#: methods/ftp.cc:885 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "" + +#: methods/ftp.cc:900 methods/rsh.cc:330 +msgid "Data socket timed out" +msgstr "" + +#: methods/ftp.cc:930 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "" + +#. Get the files information +#: methods/ftp.cc:1007 +msgid "Query" +msgstr "" + +#: methods/ftp.cc:1119 +msgid "Unable to invoke " +msgstr "" + +#: methods/connect.cc:76 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "" + +#: methods/connect.cc:87 +#, c-format +msgid "[IP: %s %s]" +msgstr "" + +#: methods/connect.cc:94 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "" + +#: methods/connect.cc:100 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "" + +#: methods/connect.cc:108 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "" + +#: methods/connect.cc:126 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "" + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:154 methods/rsh.cc:433 +#, c-format +msgid "Connecting to %s" +msgstr "" + +#: methods/connect.cc:180 methods/connect.cc:199 +#, c-format +msgid "Could not resolve '%s'" +msgstr "" + +#: methods/connect.cc:205 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "" + +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s'" +msgstr "" + +#: methods/connect.cc:211 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" +msgstr "" + +#: methods/connect.cc:258 +#, c-format +msgid "Unable to connect to %s:%s:" +msgstr "" + +#: methods/gpgv.cc:166 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" + +#: methods/gpgv.cc:170 +msgid "At least one invalid signature was encountered." +msgstr "" + +#: methods/gpgv.cc:172 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "" + +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 +msgid "Unknown error executing gpgv" +msgstr "" + +#: methods/gpgv.cc:215 methods/gpgv.cc:222 +msgid "The following signatures were invalid:\n" +msgstr "" + +#: methods/gpgv.cc:229 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" + +#: methods/gzip.cc:65 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/http.cc:394 +msgid "Waiting for headers" +msgstr "" + +#: methods/http.cc:544 +msgid "Bad header line" +msgstr "" + +#: methods/http.cc:569 methods/http.cc:576 +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/http.cc:606 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/http.cc:621 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/http.cc:623 +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/http.cc:647 +msgid "Unknown date format" +msgstr "" + +#: methods/http.cc:827 +msgid "Select failed" +msgstr "" + +#: methods/http.cc:832 +msgid "Connection timed out" +msgstr "" + +#: methods/http.cc:855 +msgid "Error writing to output file" +msgstr "" + +#: methods/http.cc:886 +msgid "Error writing to file" +msgstr "" + +#: methods/http.cc:914 +msgid "Error writing to the file" +msgstr "" + +#: methods/http.cc:928 +msgid "Error reading from server. Remote end closed connection" +msgstr "" + +#: methods/http.cc:930 +msgid "Error reading from server" +msgstr "" + +#: methods/http.cc:1198 +msgid "Bad header data" +msgstr "" + +#: methods/http.cc:1215 methods/http.cc:1270 +msgid "Connection failed" +msgstr "" + +#: methods/http.cc:1362 +msgid "Internal error" +msgstr "" + +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:464 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109 +#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 +#, c-format +msgid "Unable to read %s" +msgstr "" + +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 +#: apt-pkg/clean.cc:123 +#, c-format +msgid "Unable to change to %s" +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:315 +#, c-format +msgid "No entry found in mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" + +#: methods/rred.cc:491 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:496 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +msgid "Failed to create IPC pipe to subprocess" +msgstr "" + +#: methods/rsh.cc:338 +msgid "Connection closed prematurely" +msgstr "" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 +msgid "Press enter to continue." +msgstr "" + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "" + +#: dselect/install:102 +msgid "will be configured. This may result in duplicate errors" +msgstr "" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:102 +#, c-format +msgid "%s not a valid DEB package." +msgstr "" + +#: cmdline/apt-extracttemplates.cc:236 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 +#, c-format +msgid "Unable to write to %s" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:313 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +msgid "Package extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#, c-format +msgid "Error processing directory %s" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:262 +msgid "Source extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:379 +msgid "Error writing header to contents file" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:409 +#, c-format +msgid "Error processing contents %s" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:597 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:803 +msgid "No selections matched" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:881 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "" + +#: ftparchive/cachedb.cc:47 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "" + +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "" + +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 +#, c-format +msgid "Failed to stat %s" +msgstr "" + +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "" + +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "" + +#: ftparchive/writer.cc:82 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "" + +#: ftparchive/writer.cc:87 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "" + +#: ftparchive/writer.cc:143 +msgid "E: " +msgstr "" + +#: ftparchive/writer.cc:145 +msgid "W: " +msgstr "" + +#: ftparchive/writer.cc:152 +msgid "E: Errors apply to file " +msgstr "" + +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#, c-format +msgid "Failed to resolve %s" +msgstr "" + +#: ftparchive/writer.cc:183 +msgid "Tree walking failed" +msgstr "" + +#: ftparchive/writer.cc:210 +#, c-format +msgid "Failed to open %s" +msgstr "" + +#: ftparchive/writer.cc:269 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "" + +#: ftparchive/writer.cc:277 +#, c-format +msgid "Failed to readlink %s" +msgstr "" + +#: ftparchive/writer.cc:281 +#, c-format +msgid "Failed to unlink %s" +msgstr "" + +#: ftparchive/writer.cc:288 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "" + +#: ftparchive/writer.cc:298 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "" + +#: ftparchive/writer.cc:403 +msgid "Archive had no package field" +msgstr "" + +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 +#, c-format +msgid " %s has no override entry\n" +msgstr "" + +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr "" + +#: ftparchive/writer.cc:711 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:715 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "" + +#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#, c-format +msgid "Unable to open %s" +msgstr "" + +#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#, c-format +msgid "Malformed override %s line %llu #1" +msgstr "" + +#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#, c-format +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#, c-format +msgid "Malformed override %s line %llu #3" +msgstr "" + +#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#, c-format +msgid "Failed to read the override file %s" +msgstr "" + +#: ftparchive/multicompress.cc:70 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "" + +#: ftparchive/multicompress.cc:100 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "" + +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "" + +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "" + +#: ftparchive/multicompress.cc:206 +msgid "Compress child" +msgstr "" + +#: ftparchive/multicompress.cc:229 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "" + +#: ftparchive/multicompress.cc:304 +msgid "IO to subprocess/file failed" +msgstr "" + +#: ftparchive/multicompress.cc:342 +msgid "Failed to read while computing MD5" +msgstr "" + +#: ftparchive/multicompress.cc:358 +#, c-format +msgid "Problem unlinking %s" +msgstr "" + +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "" + +#: cmdline/apt-internal-solver.cc:37 +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "" + +#: cmdline/apt-sortpkgs.cc:153 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: apt-inst/contrib/extracttar.cc:116 +msgid "Failed to create pipes" +msgstr "" + +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "" + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +msgid "Corrupted archive" +msgstr "" + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "" + +#: apt-inst/contrib/extracttar.cc:302 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "" + +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "" + +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:94 +#, c-format +msgid "Invalid archive member header %s" +msgstr "" + +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Archive is too short" +msgstr "" + +#: apt-inst/contrib/arfile.cc:139 +msgid "Failed to read the archive headers" +msgstr "" + +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "" + +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "" + +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "" + +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "" + +#: apt-inst/filelist.cc:479 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "" + +#: apt-inst/filelist.cc:508 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "" + +#: apt-inst/filelist.cc:551 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "" + +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#, c-format +msgid "Failed to write file %s" +msgstr "" + +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#, c-format +msgid "Failed to close file %s" +msgstr "" + +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#, c-format +msgid "The path %s is too long" +msgstr "" + +#: apt-inst/extract.cc:125 +#, c-format +msgid "Unpacking %s more than once" +msgstr "" + +#: apt-inst/extract.cc:135 +#, c-format +msgid "The directory %s is diverted" +msgstr "" + +#: apt-inst/extract.cc:145 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "" + +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +msgid "The diversion path is too long" +msgstr "" + +#: apt-inst/extract.cc:242 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "" + +#: apt-inst/extract.cc:282 +msgid "Failed to locate node in its hash bucket" +msgstr "" + +#: apt-inst/extract.cc:286 +msgid "The path is too long" +msgstr "" + +#: apt-inst/extract.cc:414 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "" + +#: apt-inst/extract.cc:431 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "" + +#: apt-inst/extract.cc:491 +#, c-format +msgid "Unable to stat %s" +msgstr "" + +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "" + +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:55 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" + +#: apt-inst/deb/debfile.cc:120 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "" + +#: apt-inst/deb/debfile.cc:214 +msgid "Unparsable control file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:111 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:440 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:443 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:378 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:385 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:392 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:397 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/contrib/strutl.cc:1174 +#, c-format +msgid "Selection %s not found" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:491 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:605 +#, c-format +msgid "Opening configuration file %s" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:773 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "" + +#: apt-pkg/contrib/configuration.cc:792 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:809 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:849 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:856 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:869 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:872 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:922 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "" + +#: apt-pkg/contrib/progress.cc:146 +#, c-format +msgid "%c%s... Error!" +msgstr "" + +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Done" +msgstr "" + +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 +#, c-format +msgid "Option %s requires an argument." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:300 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:350 +#, c-format +msgid "Invalid operation %s" +msgstr "" + +#: apt-pkg/contrib/cdromutl.cc:56 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "" + +#: apt-pkg/contrib/cdromutl.cc:224 +msgid "Failed to stat the cdrom" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:93 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:226 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:231 +#, c-format +msgid "Could not open lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:249 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:253 +#, c-format +msgid "Could not get lock %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:427 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:445 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:454 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:841 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:843 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1005 +#, c-format +msgid "Could not open file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1082 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1167 +msgid "Failed to create subprocess IPC" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1222 +msgid "Failed to exec compressor " +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1317 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1404 apt-pkg/contrib/fileutl.cc:1426 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1701 +#, c-format +msgid "Problem closing the file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1713 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1724 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1737 +msgid "Problem syncing the file" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:76 +#, c-format +msgid "No keyring installed in %s." +msgstr "" + +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "" + +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "" + +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "" + +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "" + +#: apt-pkg/pkgcache.cc:167 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "" + +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "" + +#: apt-pkg/pkgcache.cc:314 +msgid "Depends" +msgstr "" + +#: apt-pkg/pkgcache.cc:314 +msgid "PreDepends" +msgstr "" + +#: apt-pkg/pkgcache.cc:314 +msgid "Suggests" +msgstr "" + +#: apt-pkg/pkgcache.cc:315 +msgid "Recommends" +msgstr "" + +#: apt-pkg/pkgcache.cc:315 +msgid "Conflicts" +msgstr "" + +#: apt-pkg/pkgcache.cc:315 +msgid "Replaces" +msgstr "" + +#: apt-pkg/pkgcache.cc:316 +msgid "Obsoletes" +msgstr "" + +#: apt-pkg/pkgcache.cc:316 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:316 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:327 +msgid "important" +msgstr "" + +#: apt-pkg/pkgcache.cc:327 +msgid "required" +msgstr "" + +#: apt-pkg/pkgcache.cc:327 +msgid "standard" +msgstr "" + +#: apt-pkg/pkgcache.cc:328 +msgid "optional" +msgstr "" + +#: apt-pkg/pkgcache.cc:328 +msgid "extra" +msgstr "" + +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "" + +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "" + +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "" + +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:244 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + +#: apt-pkg/tagfile.cc:129 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "" + +#: apt-pkg/tagfile.cc:216 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" + +#: apt-pkg/sourcelist.cc:110 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" + +#: apt-pkg/sourcelist.cc:116 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" + +#: apt-pkg/sourcelist.cc:119 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" + +#: apt-pkg/sourcelist.cc:132 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "" + +#: apt-pkg/sourcelist.cc:134 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:137 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:143 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:150 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:248 +#, c-format +msgid "Opening %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "" + +#: apt-pkg/sourcelist.cc:289 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "" + +#: apt-pkg/sourcelist.cc:293 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "" + +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 +#, c-format +msgid "Could not configure '%s'. " +msgstr "" + +#: apt-pkg/packagemanager.cc:571 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" + +#: apt-pkg/pkgrecords.cc:34 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "" + +#: apt-pkg/algorithms.cc:266 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1238 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1240 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" + +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#, c-format +msgid "List directory %spartial is missing." +msgstr "" + +#: apt-pkg/acquire.cc:85 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "" + +#: apt-pkg/acquire.cc:93 +#, c-format +msgid "Unable to lock directory %s" +msgstr "" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:895 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "" + +#: apt-pkg/acquire-worker.cc:112 +#, c-format +msgid "The method driver %s could not be found." +msgstr "" + +#: apt-pkg/acquire-worker.cc:161 +#, c-format +msgid "Method %s did not start correctly" +msgstr "" + +#: apt-pkg/acquire-worker.cc:447 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" + +#: apt-pkg/init.cc:152 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "" + +#: apt-pkg/init.cc:168 +msgid "Unable to determine a suitable packaging system type" +msgstr "" + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "" + +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" + +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" + +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" + +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "" + +#: apt-pkg/policy.cc:75 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" + +#: apt-pkg/policy.cc:399 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" + +#: apt-pkg/policy.cc:421 +#, c-format +msgid "Did not understand pin type %s" +msgstr "" + +#: apt-pkg/policy.cc:429 +msgid "No priority (or zero) specified for pin" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "" + +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:570 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1199 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +msgid "Reading package lists" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1304 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +msgid "IO Error saving source cache" +msgstr "" + +#: apt-pkg/acquire-item.cc:139 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "" + +#: apt-pkg/acquire-item.cc:599 +msgid "MD5Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1388 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1404 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" + +#: apt-pkg/acquire-item.cc:1446 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1484 +#, c-format +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" + +#: apt-pkg/acquire-item.cc:1506 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1536 +#, c-format +msgid "" +"An error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" +msgstr "" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/acquire-item.cc:1663 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1722 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package." +msgstr "" + +#: apt-pkg/acquire-item.cc:1781 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" + +#: apt-pkg/acquire-item.cc:1879 +msgid "Size mismatch" +msgstr "" + +#: apt-pkg/indexrecords.cc:68 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:78 +#, c-format +msgid "No sections in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:112 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:125 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:144 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "" + +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "" + +#: apt-pkg/cdrom.cc:576 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:613 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 +msgid "Unmounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:642 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:660 +msgid "Unmounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:665 +msgid "Waiting for disc...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:674 +msgid "Mounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:693 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:744 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:755 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" + +#: apt-pkg/cdrom.cc:782 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:811 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:828 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:830 +msgid "Copying package lists..." +msgstr "" + +#: apt-pkg/cdrom.cc:865 +msgid "Writing new source list\n" +msgstr "" + +#: apt-pkg/cdrom.cc:873 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "" + +#: apt-pkg/cacheset.cc:403 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "" + +#: apt-pkg/cacheset.cc:406 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "" + +#: apt-pkg/cacheset.cc:517 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "" + +#: apt-pkg/cacheset.cc:523 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "" + +#: apt-pkg/cacheset.cc:534 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" + +#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" + +#: apt-pkg/cacheset.cc:555 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" + +#: apt-pkg/cacheset.cc:563 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" + +#: apt-pkg/cacheset.cc:571 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" + +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:72 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951 +#, c-format +msgid "Configuring %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958 +#, c-format +msgid "Removing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:75 +#, c-format +msgid "Completely removing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:76 +#, c-format +msgid "Noting disappearance of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:77 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:704 +#, c-format +msgid "Directory '%s' missing" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 +#, c-format +msgid "Could not open file '%s'" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:944 +#, c-format +msgid "Preparing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:945 +#, c-format +msgid "Unpacking %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:950 +#, c-format +msgid "Preparing to configure %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:952 +#, c-format +msgid "Installed %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:957 +#, c-format +msgid "Preparing for removal of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:959 +#, c-format +msgid "Removed %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:964 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:965 +#, c-format +msgid "Completely removed %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1212 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1242 +msgid "Running dpkg" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1414 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1476 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1481 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1483 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1489 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1496 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1530 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:84 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:87 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "" diff --git a/prepare-release b/prepare-release index 2d8502d7f..a9cc49cfd 100755 --- a/prepare-release +++ b/prepare-release @@ -1,11 +1,15 @@ #!/bin/sh +set -e + VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" +dpkg-checkbuilddeps -d 'libxml2-utils' + if [ "$1" = 'pre-export' ]; then libraryversioncheck() { local LIBRARY="$1" diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note new file mode 100644 index 000000000..3e8a9e71d --- /dev/null +++ b/share/apt-auth-failure.note @@ -0,0 +1,11 @@ +_Name: Apt Authentication issue +Priority: High +Terminal: False +Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window +GettextDomain: apt +_Description: Problem during package list update. + The package list update failed with a authentication failure. + This usually happens behind a network proxy server. Please try + to click on the "Run this action now" button to correct the problem or + update the list manually by running Update Manager and clicking + on "Check". diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg Binary files differnew file mode 100644 index 000000000..2ce60d454 --- /dev/null +++ b/share/ubuntu-archive.gpg diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub Binary files differnew file mode 100644 index 000000000..642952a40 --- /dev/null +++ b/test/integration/exploid-keyring-with-dupe-keys.pub diff --git a/test/integration/exploid-keyring-with-dupe-subkeys.pub b/test/integration/exploid-keyring-with-dupe-subkeys.pub Binary files differnew file mode 100644 index 000000000..02d4e6ee8 --- /dev/null +++ b/test/integration/exploid-keyring-with-dupe-subkeys.pub diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver new file mode 100755 index 000000000..0622941ce --- /dev/null +++ b/test/integration/skip-aptwebserver @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' + +buildsimplenativepackage 'apt' 'all' '1.0' 'stable' + +setupaptarchive +changetowebserver + +rm -rf rootdir/var/lib/apt/lists +aptget update -qq +testequal 'Hit http://localhost stable InRelease +Hit http://localhost stable/main Sources +Hit http://localhost stable/main amd64 Packages +Hit http://localhost stable/main Translation-en +Reading package lists...' aptget update + +mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial +aptget update + diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index d013cc458..53210ea06 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -36,4 +36,5 @@ aptget changelog apt -d -qq testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" rm apt.changelog aptarchive/pool/apt_1.0.changelog -testequal 'E: changelog download failed' aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/' +# note that this output is different on ubuntu and debian +testequal 'E: changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/apt/+changelog' aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/' diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update new file mode 100755 index 000000000..d5205836f --- /dev/null +++ b/test/integration/test-apt-key-net-update @@ -0,0 +1,95 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +# mock +requires_root() { + return 0 +} + +# extract net_update() and import it +func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key ) +eval "$func" + +mkdir -p ./etc/apt +TRUSTEDFILE=./etc/apt/trusted.gpg +mkdir -p ./var/lib/apt/keyrings +TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring" +GPG="$GPG_CMD --keyring $TRUSTEDFILE" +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg + + +msgtest "add_keys_with_verify_against_master_keyring" +if [ ! -e $MASTER_KEYRING ]; then + echo -n "No $MASTER_KEYRING found" + msgskip + exit 0 +fi + +# test bad keyring and ensure its not added (LP: #857472) +ADD_KEYRING=./keys/exploid-keyring-with-dupe-keys.pub +if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then + msgfail +else + msgpass +fi + +# ensure the keyring is still empty +gpg_out=$($GPG --list-keys) +msgtest "Test if keyring is empty" +if [ -n "" ]; then + msgfail +else + msgpass +fi + + +# test another possible attack vector using subkeys (LP: #1013128) +msgtest "add_keys_with_verify_against_master_keyring with subkey attack" +ADD_KEYRING=./keys/exploid-keyring-with-dupe-subkeys.pub +if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then + msgfail +else + msgpass +fi + +# ensure the keyring is still empty +gpg_out=$($GPG --list-keys) +msgtest "Test if keyring is empty" +if [ -n "" ]; then + msgfail +else + msgpass +fi + + +# test good keyring and ensure we get no errors +ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then + msgpass +else + msgfail +fi + +testequal './etc/apt/trusted.gpg +--------------------- +pub 1024D/437D05B5 2004-09-12 +uid Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com> +sub 2048g/79164387 2004-09-12 + +pub 1024D/FBB75451 2004-12-30 +uid Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com> + +pub 4096R/C0B21F32 2012-05-11 +uid Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com> + +pub 4096R/EFE21092 2012-05-11 +uid Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com> +' $GPG --list-keys + diff --git a/test/integration/test-bug-666772-multiarch-arch-all-build-deps b/test/integration/test-bug-666772-multiarch-arch-all-build-deps new file mode 100755 index 000000000..cfae1fef3 --- /dev/null +++ b/test/integration/test-bug-666772-multiarch-arch-all-build-deps @@ -0,0 +1,118 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'armhf' + +insertinstalledpackage 'build-essential' 'all' '11.5' + +insertpackage 'unstable' 'doxygen' 'all' '1.0' 'Depends: language-support, language-tool' +insertpackage 'unstable' 'libc6' 'amd64,armhf' '1.0' 'Multi-Arch: same' +insertpackage 'unstable' 'libc6-dev' 'amd64,armhf' '1.0' 'Depends: libc6 +Multi-Arch: same' +insertpackage 'unstable' 'language-support' 'amd64,armhf' '1.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'language-tool' 'amd64,armhf' '1.0' + +insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-support language-tool libc6 libc6-dev +0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. +Inst language-support (1.0 unstable [amd64]) +Inst language-tool (1.0 unstable [amd64]) +Inst doxygen (1.0 unstable [all]) +Inst libc6 (1.0 unstable [amd64]) +Inst libc6-dev (1.0 unstable [amd64]) +Conf language-support (1.0 unstable [amd64]) +Conf language-tool (1.0 unstable [amd64]) +Conf doxygen (1.0 unstable [all]) +Conf libc6 (1.0 unstable [amd64]) +Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-support language-tool libc6:armhf libc6-dev:armhf +0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. +Inst language-support (1.0 unstable [amd64]) +Inst language-tool (1.0 unstable [amd64]) +Inst doxygen (1.0 unstable [all]) +Inst libc6:armhf (1.0 unstable [armhf]) +Inst libc6-dev:armhf (1.0 unstable [armhf]) +Conf language-support (1.0 unstable [amd64]) +Conf language-tool (1.0 unstable [amd64]) +Conf doxygen (1.0 unstable [all]) +Conf libc6:armhf (1.0 unstable [armhf]) +Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf + +configarchitecture 'armhf' 'amd64' + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-support language-tool libc6 libc6-dev +0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. +Inst language-support (1.0 unstable [armhf]) +Inst language-tool (1.0 unstable [armhf]) +Inst doxygen (1.0 unstable [all]) +Inst libc6 (1.0 unstable [armhf]) +Inst libc6-dev (1.0 unstable [armhf]) +Conf language-support (1.0 unstable [armhf]) +Conf language-tool (1.0 unstable [armhf]) +Conf doxygen (1.0 unstable [all]) +Conf libc6 (1.0 unstable [armhf]) +Conf libc6-dev (1.0 unstable [armhf])' aptget build-dep apt -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-support language-tool libc6:amd64 libc6-dev:amd64 +0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. +Inst language-support (1.0 unstable [armhf]) +Inst language-tool (1.0 unstable [armhf]) +Inst doxygen (1.0 unstable [all]) +Inst libc6:amd64 (1.0 unstable [amd64]) +Inst libc6-dev:amd64 (1.0 unstable [amd64]) +Conf language-support (1.0 unstable [armhf]) +Conf language-tool (1.0 unstable [armhf]) +Conf doxygen (1.0 unstable [all]) +Conf libc6:amd64 (1.0 unstable [amd64]) +Conf libc6-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64 + +configarchitecture 'amd64' 'armhf' + +insertinstalledpackage 'language-support' 'armhf' '0.5' 'Multi-Arch: foreign' + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-tool libc6 libc6-dev +0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded. +Inst language-tool (1.0 unstable [amd64]) +Inst doxygen (1.0 unstable [all]) +Inst libc6 (1.0 unstable [amd64]) +Inst libc6-dev (1.0 unstable [amd64]) +Conf language-tool (1.0 unstable [amd64]) +Conf doxygen (1.0 unstable [all]) +Conf libc6 (1.0 unstable [amd64]) +Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + doxygen language-tool libc6:armhf libc6-dev:armhf +0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded. +Inst language-tool (1.0 unstable [amd64]) +Inst doxygen (1.0 unstable [all]) +Inst libc6:armhf (1.0 unstable [armhf]) +Inst libc6-dev:armhf (1.0 unstable [armhf]) +Conf language-tool (1.0 unstable [amd64]) +Conf doxygen (1.0 unstable [all]) +Conf libc6:armhf (1.0 unstable [armhf]) +Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages index 879d6a3bc..c839a0fe6 100755 --- a/test/integration/test-bug-683786-build-dep-on-virtual-packages +++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages @@ -41,9 +41,13 @@ The following NEW packages will be installed: Inst po-debconf (1 unstable, unstable [all]) Conf po-debconf (1 unstable, unstable [all])' aptget build-dep dash -s -testequal 'Reading package lists... -Building dependency tree... -E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s +# ubuntu has the patch from +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666772 +# applied so the following test works in the ubuntu/master branch +# +#testequal 'Reading package lists... +#Building dependency tree... +#E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s testequal 'Reading package lists... Building dependency tree... diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove new file mode 100755 index 000000000..ffcd3963a --- /dev/null +++ b/test/integration/test-kernel-helper-autoremove @@ -0,0 +1,55 @@ +#!/bin/sh + +set -e + +# setup testdir +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +TMPDIR=$(mktemp -d) +cd $TMPDIR +addtrap "cd /; rm -rf $TMPDIR" + +# create mock environment +mkdir apt.conf.d +cat > aptconfig.conf <<EOF +Dir::Etc::parts "$TMPDIR/apt.conf.d"; +Dir::bin::dpkg "$TMPDIR/fake-dpkg"; +EOF +APT_CONFIG=aptconfig.conf +export APT_CONFIG + +# install fake-dpkg into it +install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg + +# run the helper +sh ${TESTDIR}/../../debian/apt.auto-removal.sh + +msgtest 'Check that kernel autoremoval list is correctly created' +# and ensure its there, valid and version 10.0.0-1 is there too +test -e $TMPDIR/apt.conf.d/01autoremove-kernels && msgpass || msgfail + +msgtest 'Check that most recent kernel is saved from autoremoval' +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" && msgpass || msgfail + +# ... and also that the running kernel is excluded +msgtest 'Check that running kernel is saved from autoremoval' +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" && msgpass || msgfail + +# and that the old kernel is *not* excluded from autoremoval +msgtest 'Check that older kernels are not excluded from autoremoval' +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" && msgfail || msgpass + +msgtest "Check that the older kernel is retained when it's being installed" +sh ${TESTDIR}/../../debian/apt.auto-removal.sh 1.0.01-2-generic +test -e $TMPDIR/apt.conf.d/01autoremove-kernels +if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" +then + msgfail +else + msgpass +fi + +# done diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg new file mode 100644 index 000000000..a365c5370 --- /dev/null +++ b/test/integration/test-kernel-helper-autoremove.fake-dpkg @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +if [ "$1" = "-l" ]; then + echo "ii linux-image-1.0.0-2-generic 1.0.01-2 amd64" + echo "ii linux-image-$(uname -r) not-used amd64" + echo "ii linux-image-10.0.0-1-generic 10.0.0.1-1 amd64" +elif [ "$1" = "--compare-versions" ]; then + dpkg "$1" "$2" "$3" "$4" +else + dpkg $@ +fi + |