From: David Kalnischkies Date: Sat, 8 Aug 2009 07:53:25 +0000 (+0200) Subject: merge with apt-sid X-Git-Tag: 0.7.23~1^2~15 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dee2822ae83aea4c161036a892cea6622a8e8510 merge with apt-sid * backout my fix for the sources.list issue, there is already one in --- dee2822ae83aea4c161036a892cea6622a8e8510 diff --cc debian/changelog index 5822fcae6,2d3446d48..403911833 --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,31 +1,44 @@@ - apt (0.7.23) unstable; urgency=low - - [ Michael Vogt ] - * cmdline/apt-get.cc: - - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) (Closes: #535362) ++apt (0.7.22.3) unstable; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - add APT::Get::HideAutoRemove=small to display only a short line + instead of the full package list. (Closes: #537450) + - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) + * apt-pkg/contrib/strutl.cc: + - enable thousand separator according to the current locale + (by Luca Bruno, Closes: #223712) ++ ++ -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 ++ + apt (0.7.22.2) unstable; urgency=low + + * debian/apt.cron.daily: + - Make sure that VERBOSE is always set (Closes: #539366) + - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) + - Support using debdelta to download packages (Closes: #532079) + + -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 + + apt (0.7.22.1) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem), also Closes: #535362. + + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on + non-Linux architectures as it uses mremap (Closes: #539742). * apt-pkg/sourcelist.cc: - - only show warning about missing sources.list file if no we have - no valid sourceentry (Closes: #539731) + - Only warn about missing sources.list if there is no sources.list.d + and vice versa as only one of them is needed (Closes: #539731). + * debian/control: + - Add myself to Uploaders. + - Increase Standards-Version to 3.8.2.0. - -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low diff --cc po/apt-all.pot index 605bdb8c2,a18646290..78c9c94e0 --- 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: 2009-07-31 18:47+0200\n" -"POT-Creation-Date: 2009-07-26 01:10+0200\n" ++"POT-Creation-Date: 2009-08-08 09:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -151,7 -151,7 +151,7 @@@ msgstr " #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2606 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2609 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@@ -1106,20 -1101,20 +1106,20 @@@ msgstr " msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2575 -#: cmdline/apt-get.cc:2553 ++#: cmdline/apt-get.cc:2577 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2579 -#: cmdline/apt-get.cc:2557 ++#: cmdline/apt-get.cc:2582 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2611 -#: cmdline/apt-get.cc:2589 ++#: cmdline/apt-get.cc:2614 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2652 -#: cmdline/apt-get.cc:2630 ++#: cmdline/apt-get.cc:2655 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1163,7 -1158,7 +1163,7 @@@ " This APT has Super Cow Powers.\n" msgstr "" - #: cmdline/apt-get.cc:2819 -#: cmdline/apt-get.cc:2797 ++#: cmdline/apt-get.cc:2822 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@@ -1386,10 -1381,9 +1386,11 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #. only print the warning if we can't load a valid sourcefile in the end ++#. Only warn if there are no sources.list.d. ++#. Only warn if there is no sources.list file. #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163 -#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419 +#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 - #: apt-pkg/sourcelist.cc:174 apt-pkg/sourcelist.cc:332 apt-pkg/acquire.cc:419 ++#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 #: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format @@@ -1616,7 -1610,7 +1617,7 @@@ msgstr " msgid "Server closed the connection" msgstr "" --#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190 ++#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "" @@@ -1628,7 -1622,7 +1629,7 @@@ msgstr " msgid "Protocol corruption" msgstr "" --#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232 ++#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "" @@@ -2081,50 -2075,50 +2082,50 @@@ msgstr " msgid "Waited for %s but it wasn't there" msgstr "" --#: apt-pkg/contrib/fileutl.cc:455 ++#: apt-pkg/contrib/fileutl.cc:456 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" --#: apt-pkg/contrib/fileutl.cc:457 ++#: apt-pkg/contrib/fileutl.cc:458 #, c-format msgid "Sub-process %s received signal %u." msgstr "" --#: apt-pkg/contrib/fileutl.cc:460 ++#: apt-pkg/contrib/fileutl.cc:462 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" --#: apt-pkg/contrib/fileutl.cc:462 ++#: apt-pkg/contrib/fileutl.cc:464 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" --#: apt-pkg/contrib/fileutl.cc:506 ++#: apt-pkg/contrib/fileutl.cc:508 #, c-format msgid "Could not open file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:562 ++#: apt-pkg/contrib/fileutl.cc:564 #, c-format msgid "read, still have %lu to read but none left" msgstr "" --#: apt-pkg/contrib/fileutl.cc:592 ++#: apt-pkg/contrib/fileutl.cc:594 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" --#: apt-pkg/contrib/fileutl.cc:667 ++#: apt-pkg/contrib/fileutl.cc:669 msgid "Problem closing the file" msgstr "" --#: apt-pkg/contrib/fileutl.cc:673 ++#: apt-pkg/contrib/fileutl.cc:675 msgid "Problem unlinking the file" msgstr "" --#: apt-pkg/contrib/fileutl.cc:684 ++#: apt-pkg/contrib/fileutl.cc:686 msgid "Problem syncing the file" msgstr "" @@@ -2266,27 -2260,27 +2267,27 @@@ msgstr " msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" - #: apt-pkg/sourcelist.cc:211 -#: apt-pkg/sourcelist.cc:203 ++#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:228 apt-pkg/cdrom.cc:445 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445 ++#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" - #: apt-pkg/sourcelist.cc:248 -#: apt-pkg/sourcelist.cc:240 ++#: apt-pkg/sourcelist.cc:243 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" - #: apt-pkg/sourcelist.cc:252 -#: apt-pkg/sourcelist.cc:244 ++#: apt-pkg/sourcelist.cc:247 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" - #: apt-pkg/sourcelist.cc:260 apt-pkg/sourcelist.cc:263 -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr ""