-apt (0.6.47) UNRELEASED; urgency=low
+apt (0.6.46.4ubuntu11) UNRELEASED; urgency=low
- * apt-pkg/algorithm.cc:
- - use clog for all debugging
- - only increase the score of installed applications if they
- are not obsolete
- - fix resolver bug on removal triggered by weak-dependencies
- with or-groups
- * methods/http.cc:
- - send apt version in User-Agent
- * apt-pkg/deb/debrecords.cc:
- - fix SHA1Hash() return value
- * apt-pkg/cdrom.cc:
- - only unmount if APT::CDROM::NoMount is false
- * methods/cdrom.cc:
- - only umount if it was mounted by the method before
* po/gl.po:
- - fix error translation that causes trouble to lsb_release
+ - fix error in translation that causes trouble to lsb_release
+ (LP#79165)
* apt-pkg/acquire-item.cc:
- - if decompression of a index fails, delete the index
- * [ABI] apt-pkg/acquire.{cc,h}:
+ - if decompression of a index fails, delete the index (LP#68202)
- * [internal-ABI] apt-pkg/acquire.{cc,h}:
++ * apt-pkg/acquire.{cc,h}:
- deal better with duplicated sources.list entries (avoid
double queuing of URLs) - this fixes hangs in bzip/gzip
+ (LP#102511)
++ * Fix broken use of awk in apt-key that caused removal of the wrong keys
++ from the keyring. Closes: #412572
+ * merged from Christian Perrier:
+ * mr.po: New Marathi translation Closes: #416806
+ * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * tl.po: Updated by Eric Pareja Closes: #416638
+ * gl.po: Updated by Jacobo Tarrio
+ Closes: #412828
+ * da.po: Updated by Claus Hindsgaul
+ Closes: #409483
+ * fr.po: Remove a non-breakable space for usability
+ issues. Closes: #408877
+ * ru.po: Updated Russian translation. Closes: #405476
+ * *.po: Unfuzzy after upstream typo corrections
+ * apt-pkg/policy.cc:
+ - allow multiple packages (thanks to David Foerster)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 17 Apr 2007 15:53:37 +0200
+
+apt (0.6.46.4ubuntu10) feisty; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added "APT::Never-MarkAuto-Section" and consider dependencies
+ of packages in this section manual (LP#59893)
+ - ensure proper permissions in the extended_state file (LP#67037)
+ * debian/apt.conf.ubuntu:
+ - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
+ * cmdline/apt-get.cc:
+ - "apt-get install foo" on a already installed package foo will
+ clean the automatic installed flag (LP#72007)
+ - do not show packages already marked for removal as auto-installed
+ (LP#64493)
+ - applied patch to (optionally) hide the auto-remove information
+ (thanks to Frode M. Døving) (LP#69148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100
+
+apt (0.6.46.4ubuntu9) feisty; urgency=low
+
+ * debian/control:
+ - set XS-Vcs-Bzr header
+ - Set Ubuntu maintainer address
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ - only umount if it was mounted by the method before
+ * cmdline/apt-get.cc:
+ - fix version output in autoremove list (LP#68941)
+ * apt-pkg/packagemanager.cc:
+ - do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100
+
+apt (0.6.46.4ubuntu8) feisty; urgency=low
+
+ * fix segfault in the pkgRecords destructor
+ * Bump ABI version
+ * debian/control:
+ - make the libcurl3-gnutls-dev versionized (LP#86614)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100
+
+apt (0.6.46.4ubuntu7) feisty; urgency=low
+
+ * Merged the apt--mirror branch. This means that a new 'mirror'
+ method is available that will allow dynamic mirror updates.
+ The sources.list entry looks something like this:
+ "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
+
+ It also supports error reporting to a configurable url for mirror
+ problems/failures.
+ * Bump ABI version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100
+
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/algorithms.cc:
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100
+
+apt (0.6.46.4ubuntu5) feisty; urgency=low
+
+ * added apt-transport-https package to provide a optional
+ https transport (apt-https spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100
+
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - only increase the score of installed applications if they
+ are not obsolete
+
-- Michael Vogt <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
+ * Fix broken use of awk in apt-key that caused removal of the wrong keys
+ from the keyring. Closes: #412572
+
+ -- Joey Hess <joeyh@debian.org> Mon, 26 Feb 2007 16:00:22 -0500
+
apt (0.6.46.4) unstable; urgency=high
* ack NMU (closes: #401017)
-- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000
+apt (0.6.46.3ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000
+
+apt (0.6.46.3ubuntu1) feisty; urgency=low
+
+ * doc/apt-get.8.xml:
+ - documented autoremove, thanks to Vladimír Lapá\e%GÄ\8d\e%@ek
+ (lp: #62919)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * po/en_GB.po:
+ - typo (lp: #61270)
+ * add apt-secure.8 to "See also" section
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100
+
apt (0.6.46.3) unstable; urgency=low
* apt-pkg/deb/dpkgpm.cc:
* debian/control:
- switched to libdb4.4 for building (closes: #381019)
* cmdline/apt-get.cc:
- - show only the recommends/suggests for the candidate-version, not for all
- versions of the package (closes: #257054)
- - properly handle recommends/suggests or-groups when printing the list of
- suggested/recommends packages (closes: #311619)
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu13) edgy; urgency=low
+
+ * no-changes upload to make apt rebuild against latest g++ and
+ fix synaptic FTBFS (see bug: #62461 for details)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200
+
+apt (0.6.45ubuntu12) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix in the sweep() code, set garbage flag for packages scheduled
+ for removal too
+ - do not change the autoFlag in MarkKeep(), this can lead to suprising
+ side effects
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200
+
+apt (0.6.45ubuntu11) edgy; urgency=low
+
+ * removed "installtask" and change it so that tasknames can be given
+ with "apt-get install taskname^"
+ * improve the writeStateFile() code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200
+
+apt (0.6.45ubuntu10) edgy; urgency=low
+
* methods/http.cc:
- check more careful for incorrect proxy settings (closes: #378868)
* methods/gzip.cc:
caseinsensitive (closes: #384182)
- reverted MMap use in the tagfile because it does not work
across pipes (closes: #383487)
+ * added "installtask" command
+ * added new ubuntu specific rewrite rule for "Original-Maintainer"
- -- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200
+
+apt (0.6.45ubuntu9) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - if --no-remove is given, do not run the AutoRemove code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200
+
+apt (0.6.45ubuntu8) edgy; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
+ information (lp: #59457)
+ * cmdline/apt-get.cc:
+ - fix typo in autoremove information (lp: #59420)
+ * install apt-mark to modify the automatically install information for
+ packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200
+
+apt (0.6.45ubuntu7) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
+
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
apt (0.6.45) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
-apt (0.6.44.2) unstable; urgency=low
+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.2) unstable; urgency=low
* apt-pkg/depcache.cc:
- added Debug::pkgDepCache::AutoInstall (thanks to infinity)
-- 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:
* pl.po: Completed to 512t. Closes: #349514
* sk.po: Completed to 512t. Closes: #349474
* gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
* sv.po: Completed to 512 strings Closes: #349210
* ru.po: Completed to 512 strings Closes: #349154
* da.po: Completed to 512 strings Closes: #349084
* fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
* vi.po: Completed to 511 strings Closes: #348968
- * zh_CN.po: Completed to 512t. Closes: #353936
- * it.po: Completed to 512t. Closes: #352803
- * pt_BR.po: Completed to 512t. Closes: #352419
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
* LINGUAS: Add Welsh
* *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
* make apt-cache madison work without deb-src entries (#352583)
* cmdline/apt-get.cc: only run the list-cleaner if a update was
successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
- -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
-apt (0.6.43.1) unstable; urgency=low
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+apt (0.6.43.1) unstable; urgency=low
+
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
* fr.po: Completed to 510 strings
* it.po: Completed to 510t
-- 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:
-- 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:
- unmount the cdrom when apt failed to locate any package files
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
- * better error text when dpkg-source fails
+ * better error text when dpkg-source fails
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
- patch-99: Added Galician translation
- patch-100: Completed Danish translation (Closes: #325686)
- patch-104: French translation completed
- patch-109: Italian translation completed
- - patch-112: Swedish translation update
+ - patch-112: Swedish translation update
- patch-115: Basque translation completed (Closes: #333299)
* applied french man-page update (thanks to Philippe Batailler)
(closes: #316638, #327456)
* apt-pkg/contrib/md5.cc:
- fix a alignment problem on sparc64 that gives random bus errors
(thanks to Fabbione for providing a test-case)
- * init the default ScreenWidth to 79 columns by default
+ * init the default ScreenWidth to 79 columns by default
(Closes: #324921)
- * cmdline/apt-cdrom.cc:
+ * cmdline/apt-cdrom.cc:
- fix some missing gettext() calls (closes: #334539)
* doc/apt-cache.8.xml: fix typo (closes: #334714)
-
+
-- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200
apt (0.6.41) unstable; 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
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+ * improved the network timeout handling, if a index file from a
+ sources.list times out or EAI_AGAIN is returned from getaddrinfo,
don't try to get the other files from that entry
* Support architecture-specific extra overrides
(closes: #225947). Thanks to Anthony Towns for idea and
* Javier Fernandez-Sanguino Pen~a:
- Added a first version of an apt-secure.8 manpage, and modified
apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
+ argument to apt-key which was previously not documented
(Closes: #322120)
* Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
+ - added example apt-ftparchive.conf file to doc/examples
(closes: #322483)
* Fix a incorrect example in the man-page (closes: #282918)
* Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
* add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
+ * Reread status configuration on debSystem::Initialize()
(needed for apt-proxy, thanks to Otavio for this patch)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
-- 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
-- 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
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
* Add Welsh translation from Dafydd Harries
(daf@muse.19inch.net--2005/apt--main--0--patch-1)
* Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ * Fix a incorrect example in the man-page (closes: #282918)
-- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-03-14 14:00+0100\n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
++"POT-Creation-Date: 2007-04-27 15:16+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"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
- #: cmdline/apt-cache.cc:143
+ #: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
- #: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
- #: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
- #: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+ #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+ #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+ #: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr ""
- #: cmdline/apt-cache.cc:247
+ #: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr ""
- #: cmdline/apt-cache.cc:287
+ #: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr ""
- #: cmdline/apt-cache.cc:288
+ #: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr ""
- #: cmdline/apt-cache.cc:289
+ #: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr ""
- #: cmdline/apt-cache.cc:290
+ #: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr ""
- #: cmdline/apt-cache.cc:291
+ #: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr ""
- #: cmdline/apt-cache.cc:293
+ #: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr ""
- #: cmdline/apt-cache.cc:295
- msgid "Total Distinct Descriptions: "
- msgstr ""
-
- #: cmdline/apt-cache.cc:297
+ #: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr ""
- #: cmdline/apt-cache.cc:300
+ #: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr ""
- #: cmdline/apt-cache.cc:302
- msgid "Total Desc/File relations: "
- msgstr ""
-
- #: cmdline/apt-cache.cc:304
+ #: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr ""
- #: cmdline/apt-cache.cc:316
+ #: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr ""
- #: cmdline/apt-cache.cc:330
+ #: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr ""
- #: cmdline/apt-cache.cc:335
+ #: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr ""
- #: cmdline/apt-cache.cc:343
+ #: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr ""
- #: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+ #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
- #: cmdline/apt-cache.cc:1293
+ #: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr ""
- #: cmdline/apt-cache.cc:1447
+ #: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr ""
- #: cmdline/apt-cache.cc:1524
+ #: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr ""
- #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+ #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
- #: cmdline/apt-cache.cc:1532
+ #: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
- #: cmdline/apt-cache.cc:1544
+ #: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr ""
- #: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+ #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr ""
#. Installed version
- #: cmdline/apt-cache.cc:1577
+ #: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr ""
- #: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+ #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr ""
#. Candidate Version
- #: cmdline/apt-cache.cc:1584
+ #: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr ""
- #: cmdline/apt-cache.cc:1594
+ #: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr ""
#. Show the priority tables
- #: cmdline/apt-cache.cc:1603
+ #: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr ""
- #: cmdline/apt-cache.cc:1618
+ #: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr ""
- #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+ #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2576 cmdline/apt-sortpkgs.cc:144
+ #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
- #: cmdline/apt-cache.cc:1721
+ #: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
- #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
+ #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
- #: cmdline/apt-get.cc:121
+ #: cmdline/apt-get.cc:120
msgid "Y"
msgstr ""
- #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1668
+ #: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
- #: cmdline/apt-get.cc:238
+ #: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr ""
- #: cmdline/apt-get.cc:328
+ #: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr ""
- #: cmdline/apt-get.cc:330
+ #: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr ""
- #: cmdline/apt-get.cc:337
+ #: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr ""
- #: cmdline/apt-get.cc:339
+ #: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr ""
- #: cmdline/apt-get.cc:342
+ #: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr ""
- #: cmdline/apt-get.cc:342
+ #: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr ""
- #: cmdline/apt-get.cc:347
+ #: cmdline/apt-get.cc:346
msgid " or"
msgstr ""
- #: cmdline/apt-get.cc:376
+ #: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr ""
- #: cmdline/apt-get.cc:402
+ #: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr ""
- #: cmdline/apt-get.cc:424
+ #: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr ""
- #: cmdline/apt-get.cc:445
+ #: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr ""
- #: cmdline/apt-get.cc:466
+ #: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr ""
- #: cmdline/apt-get.cc:486
+ #: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr ""
- #: cmdline/apt-get.cc:539
+ #: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr ""
- #: cmdline/apt-get.cc:547
+ #: cmdline/apt-get.cc:546
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:578
+ #: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
- #: cmdline/apt-get.cc:582
+ #: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr ""
- #: cmdline/apt-get.cc:584
+ #: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr ""
- #: cmdline/apt-get.cc:586
+ #: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
- #: cmdline/apt-get.cc:590
+ #: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
- #: cmdline/apt-get.cc:664
+ #: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr ""
- #: cmdline/apt-get.cc:667
+ #: cmdline/apt-get.cc:652
msgid " failed."
msgstr ""
- #: cmdline/apt-get.cc:670
+ #: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr ""
- #: cmdline/apt-get.cc:673
+ #: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr ""
- #: cmdline/apt-get.cc:675
+ #: cmdline/apt-get.cc:660
msgid " Done"
msgstr ""
- #: cmdline/apt-get.cc:679
+ #: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
- #: cmdline/apt-get.cc:682
+ #: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr ""
- #: cmdline/apt-get.cc:704
+ #: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
- #: cmdline/apt-get.cc:708
+ #: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr ""
- #: cmdline/apt-get.cc:715
+ #: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr ""
- #: cmdline/apt-get.cc:717
+ #: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr ""
- #: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
+ #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr ""
- #: cmdline/apt-get.cc:770
+ #: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
- #: cmdline/apt-get.cc:779
+ #: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr ""
- #: cmdline/apt-get.cc:790
+ #: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr ""
- #: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2007 cmdline/apt-get.cc:2040
+ #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
msgid "Unable to lock the download directory"
msgstr ""
- #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2088 cmdline/apt-get.cc:2324
+ #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
- #: cmdline/apt-get.cc:831
+ #: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
- #: cmdline/apt-get.cc:836
+ #: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
- #: cmdline/apt-get.cc:839
+ #: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
- #: cmdline/apt-get.cc:844
+ #: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
- #: cmdline/apt-get.cc:847
+ #: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
- #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2178
+ #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
- #: cmdline/apt-get.cc:864
+ #: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
- #: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
+ #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
- #: cmdline/apt-get.cc:881
+ #: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr ""
- #: cmdline/apt-get.cc:883
+ #: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
" ?] "
msgstr ""
- #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+ #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr ""
- #: cmdline/apt-get.cc:904
+ #: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr ""
- #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2221
+ #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
- #: cmdline/apt-get.cc:994
+ #: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr ""
- #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2230
+ #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr ""
- #: cmdline/apt-get.cc:1001
+ #: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
- #: cmdline/apt-get.cc:1005
+ #: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
- #: cmdline/apt-get.cc:1010
+ #: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr ""
- #: cmdline/apt-get.cc:1011
+ #: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr ""
- #: cmdline/apt-get.cc:1045
+ #: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
- #: cmdline/apt-get.cc:1055
+ #: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
- #: cmdline/apt-get.cc:1073
+ #: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
- #: cmdline/apt-get.cc:1084
+ #: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
- #: cmdline/apt-get.cc:1096
+ #: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr ""
- #: cmdline/apt-get.cc:1101
+ #: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr ""
- #: cmdline/apt-get.cc:1106
+ #: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"is only available from another source\n"
msgstr ""
- #: cmdline/apt-get.cc:1125
+ #: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr ""
- #: cmdline/apt-get.cc:1128
+ #: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
- #: cmdline/apt-get.cc:1148
+ #: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
- #: cmdline/apt-get.cc:1156
+ #: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
- #: cmdline/apt-get.cc:1185
+ #: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
- #: cmdline/apt-get.cc:1187
+ #: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
- #: cmdline/apt-get.cc:1193
+ #: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
- #: cmdline/apt-get.cc:1330
+ #: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr ""
- #: cmdline/apt-get.cc:1343
+ #: cmdline/apt-get.cc:1326
msgid "Unable to lock the list directory"
msgstr ""
- #: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
+ #: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
- #: cmdline/apt-get.cc:1433
- msgid "We are not supposed to delete stuff, can't start AutoRemover"
- msgstr ""
-
- #: cmdline/apt-get.cc:1465
- msgid ""
- "The following packages were automatically installed and are no longer "
- "required:"
- msgstr ""
-
- #: cmdline/apt-get.cc:1467
- msgid "Use 'apt-get autoremove' to remove them."
- msgstr ""
-
- #: cmdline/apt-get.cc:1472
- msgid ""
- "Hmm, seems like the AutoRemover destroyed something which really\n"
- "shouldn't happen. Please file a bug report against apt."
- msgstr ""
-
- #: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1750
- msgid "The following information may help to resolve the situation:"
- msgstr ""
-
- #: cmdline/apt-get.cc:1479
- msgid "Internal Error, AutoRemover broke stuff"
- msgstr ""
-
- #: cmdline/apt-get.cc:1498
+ #: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
- #: cmdline/apt-get.cc:1543
- #, c-format
- msgid "Couldn't find task %s"
- msgstr ""
-
- #: cmdline/apt-get.cc:1655 cmdline/apt-get.cc:1691
+ #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
#, c-format
msgid "Couldn't find package %s"
msgstr ""
- #: cmdline/apt-get.cc:1678
+ #: cmdline/apt-get.cc:1516
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
- #: cmdline/apt-get.cc:1709
- #, c-format
- msgid "%s set to manual installed.\n"
- msgstr ""
-
- #: cmdline/apt-get.cc:1722
+ #: cmdline/apt-get.cc:1546
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
- #: cmdline/apt-get.cc:1725
+ #: cmdline/apt-get.cc:1549
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
- #: cmdline/apt-get.cc:1737
+ #: cmdline/apt-get.cc:1561
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"
"or been moved out of Incoming."
msgstr ""
- #: cmdline/apt-get.cc:1745
+ #: cmdline/apt-get.cc:1569
msgid ""
"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."
msgstr ""
- #: cmdline/apt-get.cc:1753
+ #: cmdline/apt-get.cc:1574
+ msgid "The following information may help to resolve the situation:"
+ msgstr ""
+
+ #: cmdline/apt-get.cc:1577
msgid "Broken packages"
msgstr ""
- #: cmdline/apt-get.cc:1782
+ #: cmdline/apt-get.cc:1603
msgid "The following extra packages will be installed:"
msgstr ""
- #: cmdline/apt-get.cc:1871
+ #: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr ""
- #: cmdline/apt-get.cc:1872
+ #: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr ""
- #: cmdline/apt-get.cc:1900
+ #: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
msgstr ""
- #: cmdline/apt-get.cc:1903 methods/ftp.cc:702 methods/connect.cc:100
+ #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
- #: cmdline/apt-get.cc:1908
+ #: cmdline/apt-get.cc:1721
msgid "Done"
msgstr ""
- #: cmdline/apt-get.cc:1975 cmdline/apt-get.cc:1983
+ #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr ""
- #: cmdline/apt-get.cc:2083
+ #: cmdline/apt-get.cc:1894
msgid "Must specify at least one package to fetch source for"
msgstr ""
- #: cmdline/apt-get.cc:2113 cmdline/apt-get.cc:2342
+ #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
- #: cmdline/apt-get.cc:2157
+ #: cmdline/apt-get.cc:1968
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
- #: cmdline/apt-get.cc:2181
+ #: cmdline/apt-get.cc:1992
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
- #: cmdline/apt-get.cc:2186
+ #: cmdline/apt-get.cc:1997
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
- #: cmdline/apt-get.cc:2189
+ #: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
- #: cmdline/apt-get.cc:2195
+ #: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr ""
- #: cmdline/apt-get.cc:2226
+ #: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr ""
- #: cmdline/apt-get.cc:2254
+ #: cmdline/apt-get.cc:2065
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
- #: cmdline/apt-get.cc:2266
+ #: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
- #: cmdline/apt-get.cc:2267
+ #: cmdline/apt-get.cc:2078
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
- #: cmdline/apt-get.cc:2284
+ #: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
- #: cmdline/apt-get.cc:2303
+ #: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr ""
- #: cmdline/apt-get.cc:2319
+ #: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
msgstr ""
- #: cmdline/apt-get.cc:2347
+ #: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
- #: cmdline/apt-get.cc:2367
+ #: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
- #: cmdline/apt-get.cc:2419
+ #: cmdline/apt-get.cc:2230
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
- #: cmdline/apt-get.cc:2471
+ #: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
- #: cmdline/apt-get.cc:2506
+ #: cmdline/apt-get.cc:2317
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
- #: cmdline/apt-get.cc:2531
+ #: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
- #: cmdline/apt-get.cc:2545
+ #: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
- #: cmdline/apt-get.cc:2549
+ #: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr ""
- #: cmdline/apt-get.cc:2581
+ #: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr ""
- #: cmdline/apt-get.cc:2622
+ #: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
- #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:82
+ #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
msgstr ""
#. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
- #: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
- #: apt-pkg/pkgcachegen.cc:949
+ #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+ #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+ #: apt-pkg/pkgcachegen.cc:840
msgid "Reading package lists"
msgstr ""
msgid "Unparsable control file"
msgstr ""
-#: methods/cdrom.cc:115
+#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:124
+#: methods/cdrom.cc:123
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:132
+#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
msgstr ""
msgid "Unable to accept connection"
msgstr ""
- #: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
+ #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
msgid "Unable to invoke "
msgstr ""
- #: methods/connect.cc:65
+ #: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
- #: methods/connect.cc:72
+ #: methods/connect.cc:71
#, c-format
msgid "[IP: %s %s]"
msgstr ""
- #: methods/connect.cc:79
+ #: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
- #: methods/connect.cc:85
+ #: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
- #: methods/connect.cc:92
+ #: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
- #: methods/connect.cc:107
+ #: methods/connect.cc:108
#, 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:135 methods/rsh.cc:425
+ #: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
msgid "Read error from %s process"
msgstr ""
- #: methods/http.cc:376
+ #: methods/http.cc:377
msgid "Waiting for headers"
msgstr ""
- #: methods/http.cc:522
+ #: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
- #: methods/http.cc:530
+ #: methods/http.cc:531
msgid "Bad header line"
msgstr ""
- #: methods/http.cc:549 methods/http.cc:556
+ #: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
- #: methods/http.cc:585
+ #: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
- #: methods/http.cc:600
+ #: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
- #: methods/http.cc:602
+ #: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
- #: methods/http.cc:626
+ #: methods/http.cc:627
msgid "Unknown date format"
msgstr ""
- #: methods/http.cc:773
+ #: methods/http.cc:774
msgid "Select failed"
msgstr ""
- #: methods/http.cc:778
+ #: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
- #: methods/http.cc:801
+ #: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
- #: methods/http.cc:832
+ #: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
- #: methods/http.cc:860
+ #: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
- #: methods/http.cc:874
+ #: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
- #: methods/http.cc:876
+ #: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
- #: methods/http.cc:1110
+ #: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
- #: methods/http.cc:1127
+ #: methods/http.cc:1125
msgid "Connection failed"
msgstr ""
- #: methods/http.cc:1218
+ #: methods/http.cc:1216
msgid "Internal error"
msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
- #: apt-pkg/contrib/strutl.cc:981
+ #: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
- #: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr ""
msgid "Problem syncing the file"
msgstr ""
- #: apt-pkg/pkgcache.cc:137
+ #: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr ""
- #: apt-pkg/pkgcache.cc:143
+ #: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr ""
- #: apt-pkg/pkgcache.cc:148
+ #: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr ""
- #: apt-pkg/pkgcache.cc:153
+ #: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
- #: apt-pkg/pkgcache.cc:158
+ #: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr ""
- #: apt-pkg/pkgcache.cc:229
+ #: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr ""
- #: apt-pkg/pkgcache.cc:229
+ #: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr ""
- #: apt-pkg/pkgcache.cc:229
+ #: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr ""
- #: apt-pkg/pkgcache.cc:230
+ #: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr ""
- #: apt-pkg/pkgcache.cc:230
+ #: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr ""
- #: apt-pkg/pkgcache.cc:230
+ #: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr ""
- #: apt-pkg/pkgcache.cc:231
+ #: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr ""
#: apt-pkg/pkgcache.cc:231
- msgid "Breaks"
- msgstr ""
-
- #: apt-pkg/pkgcache.cc:242
msgid "important"
msgstr ""
- #: apt-pkg/pkgcache.cc:242
+ #: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr ""
- #: apt-pkg/pkgcache.cc:242
+ #: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr ""
- #: apt-pkg/pkgcache.cc:243
+ #: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr ""
- #: apt-pkg/pkgcache.cc:243
+ #: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr ""
- #: apt-pkg/depcache.cc:103 apt-pkg/depcache.cc:132
+ #: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
msgid "Building dependency tree"
msgstr ""
- #: apt-pkg/depcache.cc:104
+ #: apt-pkg/depcache.cc:62
msgid "Candidate versions"
msgstr ""
- #: apt-pkg/depcache.cc:133
+ #: apt-pkg/depcache.cc:91
msgid "Dependency generation"
msgstr ""
- #: apt-pkg/depcache.cc:154 apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:177
- msgid "Reading state information"
- msgstr ""
-
- #: apt-pkg/depcache.cc:201
- #, c-format
- msgid "Failed to open StateFile %s"
- msgstr ""
-
- #: apt-pkg/depcache.cc:207
- #, c-format
- msgid "Failed to write temporary StateFile %s"
- msgstr ""
-
#: apt-pkg/tagfile.cc:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgid "Opening %s"
msgstr ""
- #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
+ #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
- #: apt-pkg/packagemanager.cc:403
+ #: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
- #: apt-pkg/pkgrecords.cc:35
+ #: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
- #: apt-pkg/algorithms.cc:248
+ #: apt-pkg/algorithms.cc:241
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
- #: apt-pkg/algorithms.cc:1104
+ #: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
- #: apt-pkg/algorithms.cc:1106
+ #: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
#. only show the ETA if it makes sense
#. two days
--#: apt-pkg/acquire.cc:823
++#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
--#: apt-pkg/acquire.cc:825
++#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
- #: apt-pkg/acquire-worker.cc:384
+ #: apt-pkg/acquire-worker.cc:377
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
- #: apt-pkg/init.cc:123
+ #: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
- #: apt-pkg/init.cc:139
+ #: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
--#: apt-pkg/policy.cc:269
++#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
--#: apt-pkg/policy.cc:291
++#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
--#: apt-pkg/policy.cc:299
++#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:76
+ #: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:119
+ #: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:134
+ #: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:157
- #, c-format
- msgid "Error occured while processing %s (NewFileDesc1)"
- msgstr ""
-
- #: apt-pkg/pkgcachegen.cc:182
+ #: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:186
+ #: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:217
+ #: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:221
+ #: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:225
+ #: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:249
- #, c-format
- msgid "Error occured while processing %s (NewFileDesc2)"
- msgstr ""
-
- #: apt-pkg/pkgcachegen.cc:255
+ #: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
- #: apt-pkg/pkgcachegen.cc:258
+ #: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
- #: apt-pkg/pkgcachegen.cc:261
- msgid "Wow, you exceeded the number of descriptions this APT is capable of."
- msgstr ""
-
- #: apt-pkg/pkgcachegen.cc:264
+ #: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
- #: apt-pkg/pkgcachegen.cc:292
+ #: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:305
+ #: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:311
+ #: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:682
+ #: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:767
+ #: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
+ #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
- #: apt-pkg/acquire-item.cc:134
+ #: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
- #: apt-pkg/acquire-item.cc:286 apt-pkg/acquire-item.cc:1032
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr ""
- #: apt-pkg/acquire-item.cc:726
-#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
- #: apt-pkg/acquire-item.cc:840
-#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:760
#, 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:899
-#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
- #: apt-pkg/acquire-item.cc:935
-#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
- #: apt-pkg/acquire-item.cc:1022
-#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
- #: apt-pkg/cdrom.cc:531
+ #: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
- #: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
-#: apt-pkg/cdrom.cc:518 apt-pkg/cdrom.cc:600
++#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr ""
- #: apt-pkg/cdrom.cc:565
-#: apt-pkg/cdrom.cc:543
++#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr ""
- #: apt-pkg/cdrom.cc:585
-#: apt-pkg/cdrom.cc:563
++#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
- #: apt-pkg/cdrom.cc:603
-#: apt-pkg/cdrom.cc:581
++#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr ""
- #: apt-pkg/cdrom.cc:607
-#: apt-pkg/cdrom.cc:585
++#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
- #: apt-pkg/cdrom.cc:615
-#: apt-pkg/cdrom.cc:593
++#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr ""
- #: apt-pkg/cdrom.cc:633
-#: apt-pkg/cdrom.cc:611
++#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr ""
- #: apt-pkg/cdrom.cc:673
-#: apt-pkg/cdrom.cc:649
++#: apt-pkg/cdrom.cc:647
#, c-format
- msgid ""
- "Found %i package indexes, %i source indexes, %i translation indexes and %i "
- "signatures\n"
+ msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
- #: apt-pkg/cdrom.cc:739
-#: apt-pkg/cdrom.cc:714
++#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
- #: apt-pkg/cdrom.cc:755
-#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
- #: apt-pkg/cdrom.cc:759
-#: apt-pkg/cdrom.cc:734
++#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr ""
- #: apt-pkg/cdrom.cc:785
-#: apt-pkg/cdrom.cc:758
++#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr ""
- #: apt-pkg/cdrom.cc:794
-#: apt-pkg/cdrom.cc:767
++#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
- #: apt-pkg/cdrom.cc:836
-#: apt-pkg/cdrom.cc:810
++#: apt-pkg/cdrom.cc:807
msgid "Unmounting CD-ROM..."
msgstr ""
- #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+ #: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
- #: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+ #: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
- #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+ #: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
- #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+ #: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
projects / apt.git / commitdiff
