* merged with mainline

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 0685e36f72284e9c0c45834de0a5573b22de42cf..be2b19a1af87a79fc42030259b3f2e7b8e6eb592 100755 (executable)
--- 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"
 
 
 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"
 
 
 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
 
        exit 1
     fi