=== modified file 'scripts/add-key'
--- scripts/add-key	2008-11-01 10:53:15 +0000
+++ scripts/add-key	2008-11-01 11:21:28 +0000
@@ -39,7 +39,13 @@
 	make
 fi
 
-gpg --import $keyfile
+gpg --keyring output/keyrings/debian-keyring.gpg \
+	--keyring output/keyrings/debian-keyring.pgp \
+	--keyring output/keyrings/emeritus-keyring.gpg \
+	--keyring output/keyrings/emeritus-keyring.pgp \
+	--keyring output/keyrings/extra-keys.pgp \
+	--import-options import-clean \
+	--import $keyfile
 gpg --keyring output/keyrings/debian-keyring.gpg \
 	--keyring output/keyrings/debian-keyring.pgp \
 	--keyring output/keyrings/extra-keys.pgp --fingerprint 0x$keyid

=== modified file 'scripts/explode-keyring'
--- scripts/explode-keyring	2008-11-01 10:53:15 +0000
+++ scripts/explode-keyring	2008-11-02 22:37:19 +0000
@@ -33,5 +33,11 @@
 	echo "$out"
 	gpg --no-auto-check-trustdb --options /dev/null \
 		--no-default-keyring --keyring "$keyring" \
+		--keyring output/keyrings/debian-keyring.gpg \
+		--keyring output/keyrings/debian-keyring.pgp \
+		--keyring output/keyrings/emeritus-keyring.gpg \
+		--keyring output/keyrings/emeritus-keyring.pgp \
+		--keyring output/keyrings/extra-keys.pgp \
+		--export-options export-clean \
 		--export "$key" > "$out"
 done

=== modified file 'scripts/update-key'
--- scripts/update-key	2008-11-01 10:53:15 +0000
+++ scripts/update-key	2008-11-01 13:03:27 +0000
@@ -32,10 +32,38 @@
 	exit 1
 fi
 
-gpg --import $keydir/0x$keyid
-gpg --import $keyfile
-gpg --no-auto-check-trustdb --options /dev/null \
-		--export $keyid > $GNUPGHOME/0x$keyid
+# Check we have up to date keyrings available for checking the signatures
+echo Making keyrings
+make
+
+# This should be a no-op, but doesn't hurt.
+echo Importing key again
+gpg --keyring output/keyrings/debian-keyring.gpg \
+	--keyring output/keyrings/debian-keyring.pgp \
+	--keyring output/keyrings/emeritus-keyring.gpg \
+	--keyring output/keyrings/emeritus-keyring.pgp \
+	--keyring output/keyrings/extra-keys.pgp \
+	--import-options import-clean \
+	--no-auto-check-trustdb --options /dev/null \
+	--import $keydir/0x$keyid
+echo Importing updated key
+gpg --keyring output/keyrings/debian-keyring.gpg \
+	--keyring output/keyrings/debian-keyring.pgp \
+	--keyring output/keyrings/emeritus-keyring.gpg \
+	--keyring output/keyrings/emeritus-keyring.pgp \
+	--keyring output/keyrings/extra-keys.pgp \
+	--import-options import-clean \
+	--no-auto-check-trustdb --options /dev/null \
+	--import $keyfile
+echo Exporting combined key
+gpg --keyring output/keyrings/debian-keyring.gpg \
+	--keyring output/keyrings/debian-keyring.pgp \
+	--keyring output/keyrings/emeritus-keyring.gpg \
+	--keyring output/keyrings/emeritus-keyring.pgp \
+	--keyring output/keyrings/extra-keys.pgp \
+	--export-options export-clean \
+	--no-auto-check-trustdb --options /dev/null \
+	--export $keyid > $GNUPGHOME/0x$keyid
 
 echo "Running gpg-diff:"
 scripts/gpg-diff $keydir/0x$keyid $GNUPGHOME/0x$keyid

