Make GPGKeyring a list of keyrings; drop PGPKeyring.

[dak.git] / config / debian-non-US / dak.conf

diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf
index 7c407420c75b219393d3b9e0462b386ce77cbf61..be2527e56bc535101d62b0fe3e35724f1715dec2 100644 (file)
--- a/config/debian-non-US/dak.conf
+++ b/config/debian-non-US/dak.conf
@@ -1,7 +1,9 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   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";
    SigningKeyIds "1DB114E0";
@@ -15,7 +17,6 @@ Dinstall
    TrackingServer "packages.qa.debian.org";
    LockFile "/org/non-us.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
-   GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -32,7 +33,7 @@ Dinstall
 Reject-Proposed-Updates
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r5/";
 };
 
 Import-Users-From-Passwd
@@ -122,9 +123,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0r4";
+       Version "3.0r5";
        Origin "Debian";
-       Description "Debian 3.0r4 Released 31st December 2004";
+       Description "Debian 3.0r5 Released 15th April 2005";
        CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";