Matt Zimmerman лет назад: 21
Родитель
Сommit
7439e2e988
2 измененных файлов с 9 добавлено и 3 удалено
  1. 3 3
      cmdline/apt-key
  2. 6 0
      debian/changelog

+ 3 - 3
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
 

+ 6 - 0
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