No more pgp keyring

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index cbaebce43f7c76578913db73e1b7bfe58dce934b..151f006ad7a52e11635c165d369e33aa4c20d54f 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
      "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7c76d0ca60c2a07f12156a23790a678cfb0b7b9d..2610da38dc94d9a3c697e380746d4a66fb5e3d5b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    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";

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index c3ace63d93e7f12282b5a882bc74a7b4a3743fd3..ce0086f67e88af5b3a3a80e3ee6bb0da10f50145 100755 (executable)
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -42,7 +42,6 @@ from daklib.utils import parse_changes, warn, gpgv_get_status_output, process_gp
 def check_signature (sig_filename, data_filename=""):
     keyrings = [
         "/home/joerg/keyring/keyrings/debian-keyring.gpg",
-        "/home/joerg/keyring/keyrings/debian-keyring.pgp",
         "/home/joerg/keyring/keyrings/debian-maintainers.gpg",
         "/home/joerg/keyring/keyrings/debian-role-keys.gpg",
         "/home/joerg/keyring/keyrings/emeritus-keyring.pgp",

diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py
index da696aedc079b2cf846a3490b8ae0676e733538f..b3f8e8a8359b2c7ac991862d174550e84222a3f7 100755 (executable)
--- a/dak/import_known_changes.py
+++ b/dak/import_known_changes.py
@@ -70,7 +70,6 @@ def check_signature (sig_filename, data_filename=""):
 
     keyrings = [
         "/home/joerg/keyring/keyrings/debian-keyring.gpg",
-        "/home/joerg/keyring/keyrings/debian-keyring.pgp",
         "/home/joerg/keyring/keyrings/debian-maintainers.gpg",
         "/home/joerg/keyring/keyrings/debian-role-keys.gpg",
         "/home/joerg/keyring/keyrings/emeritus-keyring.pgp",

diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index 1fe0b0e312987892698400d667e43403ecbf6486..0c608ceaf670cefbb6275b60f71d55dc2fde1526 100644 (file)
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -64,7 +64,6 @@ $statusdelay = 30;
 
 # names of the keyring files
 @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp",
               "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file

diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 2f0d86739be3b480b96c684bd0ef6d824da4f672..57a8f3a3d212ec107f8781049e51fa38f87c4825 100644 (file)
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -63,8 +63,7 @@ $statusfile = "$incoming/status";
 $statusdelay = 30;
 
 # names of the keyring files
-@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp");
+@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";

diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index f8033936ed958631e34ac04d45c16f673152db08..a8743e53c533ad2798fb66268f5b3e494f86cb51 100644 (file)
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -64,7 +64,6 @@ $statusdelay = 30;
 
 # names of the keyring files
 @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp",
               "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file