X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b6e816c99f8fc5b9d9e0422003bce709ba6d688a;hb=141673ae65e8160c78464c1eac1ecb615aedfc54;hp=7a6364bba1038c770ec5e517151057a32166784f;hpb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7a6364bb..b6e816c9 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
    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 +15,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 +61,7 @@ Generate-Index-Diffs
    Options
    {
      TempDir "/srv/ftp.debian.org/tiffani";
-     MaxDiffs { Default 90; };
+     MaxDiffs { Default 14; };
    };
 };
 
@@ -133,7 +132,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.1r4/";
 };
 
 Import-LDAP-Fingerprints
@@ -245,9 +244,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.1r2";
+	Version "3.1r4";
 	Origin "Debian";
-	Description "Debian 3.1r2 Released 17 April 2006";
+	Description "Debian 3.1r4 Released 28 October 2006";
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "3";
@@ -350,6 +349,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -406,6 +406,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -454,6 +455,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -502,7 +504,11 @@ Suite
 	    Unstable;
 	  };
 	};
-
+	UdebComponents
+	{
+	  main;
+	  non-free;
+	};
   };
 
 };