From: Michael Vogt Date: Fri, 29 Oct 2010 14:37:35 +0000 (-0400) Subject: merged from debian X-Git-Tag: 0.9.13.exp1ubuntu1~244 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0e1945c14bee88013ad03c3b58e088c704f7ffa9?ds=inline merged from debian --- 0e1945c14bee88013ad03c3b58e088c704f7ffa9 diff --cc debian/changelog index 8324223cc,7707a5135..f13eeb856 --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,22 +1,44 @@@ ++apt (0.8.8ubuntu1) natty; urgency=low ++ ++ * merged from debian-unstable, remainging changes: ++ - use ubuntu keyring and ubuntu archive keyring in apt-key ++ - run update-apt-xapian-index in apt.cron ++ - support apt-key net-update and verify keys against master-keyring ++ - run apt-key net-update in cron.daily ++ - different example sources.list ++ ++ -- Michael Vogt Fri, 29 Oct 2010 10:07:09 -0400 ++ + apt (0.8.8) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/fileutl.cc: + - Add a FileFd::FileSize() method to get the size of the underlying + file and not the size of the content in the file as FileFd::Size() + does - the sizes can differ since the direct gzip integration + * methods/{gzip,bzip2}.cc: + - use FileSize() to determine if the file is invalid (Closes: #600852) + * apt-pkg/pkgcache.cc: + - fallback always to a suitable description (Closes: #601016) + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - ensure that history.log gets closed to avoid leaking a FD + (closes: #601649) + + -- Michael Vogt Thu, 28 Oct 2010 21:22:21 +0200 + +apt (0.8.7ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt Fri, 15 Oct 2010 18:31:17 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] diff --cc doc/po/apt-doc.pot index 8365c460f,8365c460f..49f5d7ab9 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -7,14 -7,14 +7,13 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2010-10-14 00:03+0300\n" ++"POT-Creation-Date: 2010-10-29 10:10-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" --"Language: \n" "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: ENCODING" #. type: TH #: apt.8:17 diff --cc doc/po/fr.po index ddd1fba83,12b02ac21..f8aca9595 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" --"POT-Creation-Date: 2010-10-13 23:45+0300\n" ++"POT-Creation-Date: 2010-10-29 10:10-0300\n" "PO-Revision-Date: 2010-10-06 22:33+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --cc po/apt-all.pot index 757f685da,757f685da..f092e008f --- 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: 2010-09-28 17:23+0200\n" ++"POT-Creation-Date: 2010-10-29 10:12-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -1460,8 -1460,8 +1460,8 @@@ msgstr " #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204 --#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 --#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 ++#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103 ++#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 #: methods/mirror.cc:87 #, c-format msgid "Unable to read %s" @@@ -2220,27 -2220,27 +2220,27 @@@ msgstr " msgid "write, still have %lu to write but couldn't" msgstr "" --#: apt-pkg/contrib/fileutl.cc:937 ++#: apt-pkg/contrib/fileutl.cc:967 #, c-format msgid "Problem closing the gzip file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:940 ++#: apt-pkg/contrib/fileutl.cc:970 #, c-format msgid "Problem closing the file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:945 ++#: apt-pkg/contrib/fileutl.cc:975 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:956 ++#: apt-pkg/contrib/fileutl.cc:986 #, c-format msgid "Problem unlinking the file %s" msgstr "" --#: apt-pkg/contrib/fileutl.cc:969 ++#: apt-pkg/contrib/fileutl.cc:999 msgid "Problem syncing the file" msgstr "" @@@ -2523,12 -2523,12 +2523,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" --#: apt-pkg/init.cc:143 ++#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:159 ++#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2923,12 -2923,12 +2923,12 @@@ msgstr " msgid "Installing %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822 ++#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 #, c-format msgid "Configuring %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829 ++#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 #, c-format msgid "Removing %s" msgstr "" @@@ -2954,87 -2954,87 +2954,87 @@@ msgstr " msgid "Directory '%s' missing" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674 ++#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Could not open file '%s'" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:815 ++#: apt-pkg/deb/dpkgpm.cc:816 #, c-format msgid "Preparing %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:816 ++#: apt-pkg/deb/dpkgpm.cc:817 #, c-format msgid "Unpacking %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:821 ++#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Preparing to configure %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:823 ++#: apt-pkg/deb/dpkgpm.cc:824 #, c-format msgid "Installed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:828 ++#: apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Preparing for removal of %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:830 ++#: apt-pkg/deb/dpkgpm.cc:831 #, c-format msgid "Removed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:835 ++#: apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Preparing to completely remove %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:836 ++#: apt-pkg/deb/dpkgpm.cc:837 #, c-format msgid "Completely removed %s" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1042 ++#: apt-pkg/deb/dpkgpm.cc:1043 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1073 ++#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Running dpkg" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1276 ++#: apt-pkg/deb/dpkgpm.cc:1277 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error --#: apt-pkg/deb/dpkgpm.cc:1281 ++#: apt-pkg/deb/dpkgpm.cc:1282 msgid "dependency problems - leaving unconfigured" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1283 ++#: apt-pkg/deb/dpkgpm.cc:1284 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1289 ++#: apt-pkg/deb/dpkgpm.cc:1290 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1295 ++#: apt-pkg/deb/dpkgpm.cc:1296 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" --#: apt-pkg/deb/dpkgpm.cc:1302 ++#: apt-pkg/deb/dpkgpm.cc:1303 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr ""