From: Michael Vogt Date: Wed, 2 May 2007 11:40:45 +0000 (+0200) Subject: * apt-pkg/acquire.{cc,h}: X-Git-Tag: 0.7.24ubuntu1~186 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/66c8f0766ef9f2d660251ece524fcb82d5ea3813 * apt-pkg/acquire.{cc,h}: * 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) * NMU * Fix broken use of awk in apt-key that caused removal of the wrong keys from the keyring. Closes: #412572 --- 66c8f0766ef9f2d660251ece524fcb82d5ea3813 diff --cc debian/changelog index 0701185b9,8294c45d9..e0a735e2f --- a/debian/changelog +++ b/debian/changelog @@@ -1,127 -1,51 +1,151 @@@ -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 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 Wed, 14 Mar 2007 13:32:32 +0100 + +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + - only umount if it was mounted by the method before + * cmdline/apt-get.cc: + - fix version output in autoremove list (LP#68941) + * apt-pkg/packagemanager.cc: + - do not spin 100% cpu in FixMissing() (LP#84476) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * doc/examples/configure-index: + - document APT::Acquire::Translation + -- Michael Vogt Tue, 13 Mar 2007 15:24:39 +0100 + +apt (0.6.46.4ubuntu8) feisty; urgency=low + + * fix segfault in the pkgRecords destructor + * Bump ABI version + * debian/control: + - make the libcurl3-gnutls-dev versionized (LP#86614) + + -- Michael Vogt Mon, 26 Feb 2007 14:26:33 +0100 + +apt (0.6.46.4ubuntu7) feisty; urgency=low + + * Merged the apt--mirror branch. This means that a new 'mirror' + method is available that will allow dynamic mirror updates. + The sources.list entry looks something like this: + "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" + + It also supports error reporting to a configurable url for mirror + problems/failures. + * Bump ABI version + + -- Michael Vogt Tue, 6 Feb 2007 11:38:06 +0100 + +apt (0.6.46.4ubuntu6) feisty; urgency=low + + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/algorithms.cc: + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + - fix segfault (lp: #76530) + + -- Michael Vogt Wed, 20 Dec 2006 11:04:36 +0100 + +apt (0.6.46.4ubuntu5) feisty; urgency=low + + * added apt-transport-https package to provide a optional + https transport (apt-https spec) + + -- Michael Vogt Tue, 19 Dec 2006 16:23:43 +0100 + +apt (0.6.46.4ubuntu4) feisty; urgency=low + + * apt-pkg/algorithms.cc: + - only increase the score of installed applications if they + are not obsolete + -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 +apt (0.6.46.4ubuntu3) feisty; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) + + -- Michael Vogt Mon, 18 Dec 2006 11:56:05 +0100 + +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + (thanks to Ian Jackson) + + -- Michael Vogt Thu, 7 Dec 2006 23:07:24 +0100 + +apt (0.6.46.4ubuntu1) feisty; urgency=low + + * merged with debian + + -- Michael Vogt Thu, 7 Dec 2006 12:13:14 +0100 + + apt (0.6.46.4-0.1) unstable; urgency=emergency + + * NMU + * Fix broken use of awk in apt-key that caused removal of the wrong keys + from the keyring. Closes: #412572 + + -- Joey Hess Mon, 26 Feb 2007 16:00:22 -0500 + apt (0.6.46.4) unstable; urgency=high * ack NMU (closes: #401017) diff --cc po/apt-all.pot index f5f5b363f,981b0465a..b55c31ff4 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " 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 \n" "Language-Team: LANGUAGE \n" @@@ -2274,12 -2213,12 +2213,12 @@@ 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 "" @@@ -2325,16 -2264,16 +2264,16 @@@ 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 "" @@@ -2436,35 -2361,35 +2361,35 @@@ msgstr " 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 "" @@@ -2480,68 -2405,66 +2405,66 @@@ msgid " "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 ""