Merge branch 'master' into franck

* master:
  No more pgp keyring

diff --cc config/debian/dak.conf
index c0a902c400ba29b24d67e139b762390807471561,2610da38dc94d9a3c697e380746d4a66fb5e3d5b..328d5811b176b9483ef802f904856b4aa32ab6bc
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -2,11 -2,10 +2,10 @@@ Dinstal
  {
     GPGKeyring {
        "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
        "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
     };
 -   SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 -   SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 +   SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 +   SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
     SigningKeyIds "55BE302B";
  //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
     SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";