* fix the breakage from my last commit (note to self: always, _always_ run baz diff...
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 1 Aug 2005 16:13:28 +0000 (16:13 +0000)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 1 Aug 2005 16:13:28 +0000 (16:13 +0000)
cmdline/apt-key
debian/apt.postinst

index be2b19a..0685e36 100755 (executable)
@@ -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/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
        echo >&2 "ERROR: Can't find the archive-keyring"
-       echo >&2 "Is the ubuntu-keyring package installed?"
+       echo >&2 "Is the debian-keyring package installed?"
        exit 1
     fi
 
index df04330..ae18011 100644 (file)
@@ -17,7 +17,7 @@ case "$1" in
     configure)
 
         if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
+                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
         fi
 
     ;;