summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-29 15:39:49 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-29 15:39:49 +0000
commit7439e2e988e5c097f922acd04b648deb54d16122 (patch)
treeefd8442eff811e215e7fb8a09fb9f846bbe4e078
parentc024fee6fd45c7aff4732370ee48d660284f4933 (diff)
Fix keyring path in apt-key
-rwxr-xr-xcmdline/apt-key6
-rw-r--r--debian/changelog6
2 files changed, 9 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 0685e36f7..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
diff --git a/debian/changelog b/debian/changelog
index cb092b803..a5f2b8960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Fix keyring path in apt-key (I swear I remember doing this before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
apt (0.6.39ubuntu1) breezy; urgency=low
* Michael Vogt