From: Michael Vogt Date: Tue, 9 Jun 2009 14:11:15 +0000 (+0200) Subject: merged from the debian-sid branch X-Git-Tag: 0.7.24ubuntu1~16 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/aa16679ccb39598b9b4546c912af1cf8c70e529b merged from the debian-sid branch --- aa16679ccb39598b9b4546c912af1cf8c70e529b diff --cc apt-pkg/deb/debsystem.cc index 186918d25,ccd45d51b..089a465c1 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@@ -18,7 -18,7 +18,6 @@@ #include #include #include - - #include #include #include diff --cc cmdline/apt-get.cc index 988abe216,028f371b5..adb1c9214 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -1301,9 -1301,9 +1301,8 @@@ pkgSrcRecords::Parser *FindSrc(const ch while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { string Ver = Parse->Version(); - - // show name mismatches - if (IsMatch == true && Parse->Package() != Src) + if (IsMatch == true && Parse->Package() != Src) ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) diff --cc configure.in index 130fe065d,48b1def5c..f590310a4 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,8 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu5") ++ + AC_DEFINE_UNQUOTED(VERSION,"0.7.21") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index 8958bdfb7,5d3a801a8..2d2153d07 --- a/debian/changelog +++ b/debian/changelog @@@ -1,130 -1,66 +1,193 @@@ - apt (0.7.20.2ubuntu8) UNRELEASEDkarmic; urgency=low -apt (0.7.22) UNRELEASED; urgency=low ++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 ++ - 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 + - -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 ++ [ Michael Vogt ] + * apt-pkg/acquire.cc: + - make the max pipeline depth of the acquire queue configurable + via Acquire::Max-Pipeline-Depth + - -- Michael Vogt Thu, 28 May 2009 17:51:42 +0200 ++ -- Michael Vogt Tue, 09 Jun 2009 15:49:07 +0200 + + apt (0.7.21) unstable; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + - fr.po. Closes: #520430 + - sv.po. Closes: #518070 + - sk.po. Closes: #520403 + - it.po. Closes: #522222 + - sk.po. Closes: #520403 - ++ + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files + + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * [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/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 + * Clarify the --help for 'purge' (LP: #243948) + * 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 ++ a source package of the same name but from different + packages (LP: #330103) + + [ 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 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 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 Wed, 08 Apr 2009 22:39:50 +0200 + +apt (0.7.20.2ubuntu5) jaunty; urgency=low + + [ Colin Watson ] + * cmdline/acqprogress.cc: + - Call pkgAcquireStatus::Pulse even if quiet, so that we still get + dlstatus messages on the status-fd (LP: #290234). + + [ Michael Vogt ] + * debian/apt.cron.daily: + - do not clutter cron mail with bogus gconftool messages + (LP: #223502) + - merge fix for cache locking from debian (closes: #459344) + - run update-apt-xapian-index (with ionice) to ensure that + the index is up-to-date when synaptic is run (LP: #288797) + + -- Michael Vogt Mon, 30 Mar 2009 13:22:28 +0200 + +apt (0.7.20.2ubuntu4) jaunty; urgency=low + + * ftparchive/cachedb.cc: + - when apt-ftparchive clean is used, compact the database + at the end (thanks to cprov) + + -- Michael Vogt Thu, 26 Mar 2009 13:43:59 +0100 + +apt (0.7.20.2ubuntu3) jaunty; urgency=low + + * methods/mirror.cc: + - when download the mirror file and the server is down, + return a propper error message (LP: #278635) + + -- Michael Vogt Thu, 19 Mar 2009 15:42:15 +0100 + +apt (0.7.20.2ubuntu2) jaunty; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - revert termios patch (LP: #338514) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) + + -- Michael Vogt Mon, 09 Mar 2009 16:33:28 +0100 + +apt (0.7.20.2ubuntu1) jaunty; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + + [ Michael Vogt ] + * merged from the debian-sid branch + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove + blacklist + * fix some i18n issues (thanks to Gabor Kelemen) + LP: #263089 + * apt-pkg/deb/dpkgpm.cc: + - filter "ENOMEM" errors when creating apport reports + * cmdline/apt-get.cc: + - fix "apt-get source pkg=ver" if binary name != source name + (LP: #202219) + * apt-pkg/indexrecords.cc: + - fix some i18n issues + * apt-pkg/contrib/strutl.h: + - add new strprintf() function to make i18n strings easier + * apt-pkg/dev/debsystem.cc: + - add missing apti18n.h header + * cmdline/apt-get.cc: + - default to "false" for the "APT::Get::Build-Dep-Automatic" + option (follow debian here) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) + * methods/https.cc: + - add Acquire::https::AllowRedirect support + - do not unlink files in partial/ (thanks to robbiew) + + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + + -- Michael Vogt Mon, 09 Feb 2009 14:21:05 +0100 + apt (0.7.20.2) unstable; urgency=medium [ Eugene V. Lyubimkin ] diff --cc po/apt-all.pot index 55f35cafa,ec87b27a3..9f826514b --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -1673,8 -1666,7 +1673,8 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 - #: methods/http.cc:993 ++#: methods/http.cc:994 msgid "Problem hashing file" msgstr "" @@@ -1805,78 -1797,80 +1805,78 @@@ msgstr " msgid "Read error from %s process" msgstr "" - #: methods/http.cc:377 methods/http.cc:378 -#: methods/http.cc:377 ++#: methods/http.cc:377 methods/http.cc:379 msgid "Waiting for headers" msgstr "" - #: methods/http.cc:523 methods/http.cc:524 -#: methods/http.cc:523 ++#: methods/http.cc:523 methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "" - #: methods/http.cc:531 methods/http.cc:532 -#: methods/http.cc:531 ++#: methods/http.cc:531 methods/http.cc:533 msgid "Bad header line" msgstr "" - #: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551 - #: methods/http.cc:558 -#: methods/http.cc:550 methods/http.cc:557 ++#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:552 ++#: methods/http.cc:559 msgid "The HTTP server sent an invalid reply header" msgstr "" - #: methods/http.cc:586 methods/http.cc:587 -#: methods/http.cc:586 ++#: methods/http.cc:586 methods/http.cc:588 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" - #: methods/http.cc:601 methods/http.cc:602 -#: methods/http.cc:601 ++#: methods/http.cc:601 methods/http.cc:603 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" - #: methods/http.cc:603 methods/http.cc:604 -#: methods/http.cc:603 ++#: methods/http.cc:603 methods/http.cc:605 msgid "This HTTP server has broken range support" msgstr "" - #: methods/http.cc:627 methods/http.cc:628 -#: methods/http.cc:627 ++#: methods/http.cc:627 methods/http.cc:629 msgid "Unknown date format" msgstr "" - #: methods/http.cc:774 methods/http.cc:781 -#: methods/http.cc:774 ++#: methods/http.cc:774 methods/http.cc:782 msgid "Select failed" msgstr "" - #: methods/http.cc:779 methods/http.cc:786 -#: methods/http.cc:779 ++#: methods/http.cc:779 methods/http.cc:787 msgid "Connection timed out" msgstr "" - #: methods/http.cc:802 methods/http.cc:809 -#: methods/http.cc:802 ++#: methods/http.cc:802 methods/http.cc:810 msgid "Error writing to output file" msgstr "" - #: methods/http.cc:833 methods/http.cc:840 -#: methods/http.cc:833 ++#: methods/http.cc:833 methods/http.cc:841 msgid "Error writing to file" msgstr "" - #: methods/http.cc:861 methods/http.cc:868 -#: methods/http.cc:861 ++#: methods/http.cc:861 methods/http.cc:869 msgid "Error writing to the file" msgstr "" - #: methods/http.cc:875 methods/http.cc:882 -#: methods/http.cc:875 ++#: methods/http.cc:875 methods/http.cc:883 msgid "Error reading from server. Remote end closed connection" msgstr "" - #: methods/http.cc:877 methods/http.cc:884 -#: methods/http.cc:877 ++#: methods/http.cc:877 methods/http.cc:885 msgid "Error reading from server" msgstr "" - #: methods/http.cc:1104 methods/http.cc:1143 -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -msgid "Failed to truncate file" -msgstr "" - -#: methods/http.cc:1105 ++#: methods/http.cc:1104 methods/http.cc:1144 msgid "Bad header data" msgstr "" - #: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160 - #: methods/http.cc:1215 -#: methods/http.cc:1122 methods/http.cc:1177 ++#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1161 ++#: methods/http.cc:1216 msgid "Connection failed" msgstr "" - #: methods/http.cc:1228 methods/http.cc:1307 -#: methods/http.cc:1229 ++#: methods/http.cc:1228 methods/http.cc:1308 msgid "Internal error" msgstr "" @@@ -2667,143 -2671,3 +2667,143 @@@ msgstr " #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#: methods/gpgv.cc:232 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" + - #: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196 ++#: methods/http.cc:979 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/acquire-item.cc:1244 +#, c-format +msgid "" +"A 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 "" + +#: apt-pkg/acquire-item.cc:1253 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:40 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:47 +#, c-format +msgid "No sections in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:81 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:51 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:54 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1011 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1016 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1018 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1024 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1030 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + - #: apt-pkg/deb/debsystem.cc:70 ++#: apt-pkg/deb/debsystem.cc:69 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + - #: apt-pkg/deb/debsystem.cc:73 ++#: apt-pkg/deb/debsystem.cc:72 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" + - #: apt-pkg/deb/debsystem.cc:82 ++#: apt-pkg/deb/debsystem.cc:81 +msgid "" +"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to " +"correct the problem. " +msgstr "" + - #: apt-pkg/deb/debsystem.cc:100 ++#: apt-pkg/deb/debsystem.cc:99 +msgid "Not locked" +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:172 +#, c-format +msgid "No mirror file '%s' found " +msgstr ""