From: Michael Vogt Date: Fri, 6 Jan 2006 00:24:31 +0000 (+0000) Subject: * merged with main X-Git-Tag: 0.7.21~343 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4d165fe0b5974454f706d42e7bb9e8424fe7fe64 * merged with main Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114 * merged with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115 * string fix --- 4d165fe0b5974454f706d42e7bb9e8424fe7fe64 diff --cc apt-pkg/acquire-item.cc index 11a449e91,11a449e91..86f61dd00 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -642,7 -642,7 +642,7 @@@ bool pkgAcqMetaIndex::VerifyVendor(stri // check for missing sigs (that where not fatal because otherwise we had // bombed earlier) string missingkeys; -- string msg = _("There was no public key available for the " ++ string msg = _("There are no public key available for the " "following key IDs:\n"); pos = Message.find("NO_PUBKEY "); if (pos != std::string::npos) diff --cc debian/changelog index 8bcb42566,8bcb42566..694d91b68 --- a/debian/changelog +++ b/debian/changelog @@@ -15,10 -15,10 +15,11 @@@ apt (0.6.43.1) unstable; urgency=lo * apt-get source won't download already downloaded files again (closes: #79277) * share/debian-archive.gpg: new 2006 ftp-archive signing key added ++ (#345891) * redownload the Release file if IMS-Hit and gpg failure -- * deal with multiple signatures ++ * deal with multiple signatures on a Release file -- -- Michael Vogt Thu, 5 Jan 2006 23:47:40 +0100 ++ -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 apt (0.6.43) unstable; urgency=medium