Update variables for 3.1r2. [troup] Update SigningKeyIds. Add amd64 to >= testing...

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index c8b5b679b28c7546c2e125a0c4805b3c9a1d71dd..f0f4893131716262c23dc5f5d9890f792aaae61e 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "4F368D5D";
+   SigningKeyIds "2D230C5F";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -109,8 +109,8 @@ Import-Archive
 
 Reject-Proposed-Updates
 {
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.1r2/";
+   StableRejector "Andreas Barth and Martin Zobel-Helas";
+   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r2/";
 };
 
 Import-LDAP-Fingerprints
@@ -222,9 +222,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r1";
+       Version "3.1r2";
        Origin "Debian";
-       Description "Debian 3.1r1 Released 17 December 2005";
+       Description "Debian 3.1r2 Released 17 April 2006";
        CodeName "sarge";
        OverrideCodeName "sarge";
        Priority "3";
@@ -306,6 +306,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
@@ -342,6 +343,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
@@ -397,6 +399,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          hurd-i386;
@@ -407,7 +410,6 @@ Suite
          mipsel;
          powerpc;
          s390;
-         sh;
          sparc;
        };
        Announce "debian-devel-changes@lists.debian.org";
@@ -445,6 +447,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          hurd-i386;
@@ -455,7 +458,6 @@ Suite
          mipsel;
          powerpc;
          s390;
-         sh;
          sparc;
        };
        Announce "debian-devel-changes@lists.debian.org";
@@ -466,7 +468,6 @@ Suite
        OverrideCodeName "sid";
        OverrideSuite "unstable";
        Priority "0";
-        Tree "project/experimental";
        VersionChecks
        {
          MustBeNewerThan
@@ -515,6 +516,7 @@ Dir
   {
     Accepted "/org/ftp.debian.org/queue/accepted/";
     Byhand "/org/ftp.debian.org/queue/byhand/";
+    ProposedUpdates "/org/ftp.debian.org/queue/p-u-new/";
     Done "/org/ftp.debian.org/queue/done/";
     Holding "/org/ftp.debian.org/queue/holding/";
     New "/org/ftp.debian.org/queue/new/";
@@ -544,6 +546,7 @@ Architectures
   alpha "DEC Alpha";
   hurd-i386 "Intel ia32 running the HURD";
   hppa "HP PA RISC";
+  amd64 "AMD64";
   arm "ARM";
   i386 "Intel ia32";
   ia64 "Intel ia64";