Updates source checking instructions (2)

diff --git a/.devscripts b/.devscripts
index d095dacf955dfb428a799719ab7d7a8aa5e2c6bf..a5b0c863c5518d5c6da8c06d5d3ec53aded1bad5 100644 (file)
--- a/.devscripts
+++ b/.devscripts
@@ -1 +1,2 @@
-DSCVERIFY_KEYRINGS="/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-maintainers.gpg:~/keyrings/debian-keyring.gpg:~/keyrings/debian-maintainers.gpg"
+#DSCVERIFY_KEYRINGS="/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-maintainers.gpg:~/keyrings/debian-keyring.gpg:~/keyrings/debian-maintainers.gpg"
+DSCVERIFY_KEYRINGS="/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-maintainers.gpg:~/.gnupg/trustedkeys.kbx"

diff --git a/Makefile b/Makefile
index 458ab420dc5b942843299941c333b2f971b25a46..47893ec7350169823aaf31de92462fbadb30139e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ keyring:
        @rsync -az --progress keyring.debian.org::keyrings/ keyring/
        @gpg --verify keyring/sha512sums.txt
        @cd keyring > /dev/null && sha512sum -c sha512sums.txt
-       @cd keyring > /dev/null && chmod 700 keyrings && ln -sf keyrings .gnupg #&& cd .gnupg && ln -sf debian-keyring.gpg trustedkeys.gpg
+       @cd keyring > /dev/null && mkdir .gnupg && chmod 700 .gnupg
        @cp .devscripts keyring/
        @gpg --no-default-keyring --keyring keyring/keyrings/debian-keyring.gpg     --export | HOME=keyring/ gpg --import
        @gpg --no-default-keyring --keyring keyring/keyrings/debian-maintainers.gpg --export | HOME=keyring/ gpg --import

diff --git a/checking.md b/checking.md
index c30a27d8b1217b5a3473c5d8c1fc022eea2f62f6..8fb3cd116c4fe22e354c08278176a5bf5359a308 100644 (file)
--- a/checking.md
+++ b/checking.md
@@ -61,7 +61,8 @@ Things get even trickier when you try to use `dpkg-source`. See [Debian Bug repo
 type of key resource 'trustedkeys.kbx'](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852019)
 for details.
 
-Even if you symlink `keyring/keyrings/debian-keyring.gpg` as `keyring/keyrings/trustedkeys.gpg`
+Even if you merge both `keyring/keyrings/debian-keyring.gpg` `keyring/keyrings/debian-maintainers.gpg`
+into some file like `keyring/keyrings/pubring.kbx`, symlink it as `keyring/keyrings/trustedkeys.gpg`
 and point `GNUPGHOME` to this folder you'll still get a weird behavior:
 
     0 $ dget http://ftp.de.debian.org/debian/pool/main/r/ruby-childprocess/ruby-childprocess_0.5.2-1.dsc
@@ -102,14 +103,9 @@ and `dpkg-source` with
     HOME=/path/to/debian/keyring/ dpkg-source -x $package*dsc
     HOME=/path/to/debian/keyring/ dget <remote-dsc>
 
-For this trick to work, you'll need to run `make keyring` or manually run this:
+For this trick to work, you'll need to run
 
-    ( cd /path/to/debian/keyring/ && chmod 700 keyrings && ln -sf keyrings .gnupg && cd .gnupg && ln -sf debian-keyring.gpg trustedkeys.gpg )
-
-If you're doing manually, make sure to add into `/path/to/debian/keyring/.devscripts` the following content:
-
-    DSCVERIFY_KEYRINGS="/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-maintainers.gpg:
-                        ~/keyrings/debian-keyring.gpg:~/keyrings/debian-maintainers.gpg"
+    make keyring
 
 Again, you might set two handy aliases for your shell: