Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

diff --git a/scripts/debian/buildd-prepare-dir b/scripts/debian/buildd-prepare-dir
index 0c1f08ba93662c4be83f1e6993cca5dcfeba68c4..962e4635951080d122f2cc3165affcfbce5eb175 100755 (executable)
--- a/scripts/debian/buildd-prepare-dir
+++ b/scripts/debian/buildd-prepare-dir
@@ -40,6 +40,7 @@ PROGRAM="buildd-prepare-dir"
 
 # should be relative to the general base dir later
 COPYTARGET="${base}/keyrings"
+GNUPGHOME="${base}/s3kr1t/dot-gnupg"
 base="${base}/scripts/builddkeyrings"
 TARGET="${base}/keyrings"
 REMOVED="${base}/removed-buildd-keys.gpg"
@@ -57,6 +58,6 @@ cd ${TARGET}
 sha512sum keyrings/* > sha512sums
 
 rm -f ${TARGET}/sha512sums.txt
-SIGNINGKEY=$(dak admin c signingkeyids)
-gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
+SIGNINGKEY=B1326A8D
+GNUPGHOME=${GNUPGHOME} gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
 rm -f ${TARGET}/sha512sums