diff options
| author | Michael Vogt <mvo@debian.org> | 2006-01-06 00:24:31 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2006-01-06 00:24:31 +0000 |
| commit | 4d165fe0b5974454f706d42e7bb9e8424fe7fe64 (patch) | |
| tree | 54d6cfdd83fdbc6232224665e43c074eeacd562b | |
| parent | ce424cd4464ce46706046d581e05fbf292a54881 (diff) | |
| parent | d551d30974c274cd67f7968902c00656adb93412 (diff) | |
* 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
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 11a449e91..86f61dd00 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -642,7 +642,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) // 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 --git a/debian/changelog b/debian/changelog index 8bcb42566..694d91b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,11 @@ apt (0.6.43.1) unstable; urgency=low * 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 <mvo@debian.org> Thu, 5 Jan 2006 23:47:40 +0100 + -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 apt (0.6.43) unstable; urgency=medium |