Make GPGKeyring a list of keyrings; drop PGPKeyring.

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7a6364bba1038c770ec5e517151057a32166784f..50390f5b4b261371ab49c90e12712e8bfaebb223 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,10 +1,12 @@
 Dinstall
 {
-   PGPKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+   GPGKeyrings {
+      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
+   };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "2D230C5F";
+   SigningKeyIds "6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -15,7 +17,6 @@ Dinstall
    TrackingServer "packages.qa.debian.org";
    LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
-   GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -62,7 +63,7 @@ Generate-Index-Diffs
    Options
    {
      TempDir "/srv/ftp.debian.org/tiffani";
-     MaxDiffs { Default 90; };
+     MaxDiffs { Default 14; };
    };
 };
 
@@ -133,7 +134,7 @@ Import-Archive
 Reject-Proposed-Updates
 {
    StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r2/";
+   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r5/";
 };
 
 Import-LDAP-Fingerprints
@@ -245,9 +246,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r2";
+       Version "3.1r5";
        Origin "Debian";
-       Description "Debian 3.1r2 Released 17 April 2006";
+       Description "Debian 3.1r5 Released 17 February 2007";
        CodeName "sarge";
        OverrideCodeName "sarge";
        Priority "3";
@@ -350,6 +351,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -406,6 +408,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -454,6 +457,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -502,7 +506,11 @@ Suite
            Unstable;
          };
        };
-
+       UdebComponents
+       {
+         main;
+         non-free;
+       };
   };
 
 };