X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fdak.conf;h=50390f5b4b261371ab49c90e12712e8bfaebb223;hb=6c92853af8a7ca65fad19cb0f1a0ffaecec48fb7;hp=345607c4d51ca08bbdf2229089e8512a341483d6;hpb=c55e170c1f28d1bc94ef5c522badebf9214500c5;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 345607c4..50390f5b 100644
--- 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";