Merge commit 'pkern/master'

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3f7366cac58e86869050dee845eb9b9f3512a3e2..7b7f5e8ebe039ac4a21d62d112eb56989250db9d 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -27,7 +27,6 @@ Dinstall
    StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
-   ReleaseTransitions "/srv/ftp.debian.org/testing/hints/transitions.yaml";
    QueueBuildSuites
    {
      unstable;
@@ -35,9 +34,40 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
+     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
 };
 
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};
+
+Binary-Upload-Restrictions
+{
+ Components
+ {
+   //main;
+   //contrib;
+   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
+   none;
+ };
+ unstable
+ {
+   arm
+   {
+     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
+     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
+     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
+   };
+   alpha 
+   {
+     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
+     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
+   };   
+  };
+};
+
 Binary-Upload-Restrictions
 {
  Components
@@ -143,8 +173,9 @@ Import-Archive
 
 Reject-Proposed-Updates
 {
-   StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/";
+   StableRejector "the Stable Release Team";
+   StableMail "debian-release@lists.debian.org";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
 };
 
 Import-LDAP-Fingerprints
@@ -222,9 +253,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r6";
+       Version "3.1r8";
        Origin "Debian";
-       Description "Debian 3.1r6 Released 7 April 2007";
+       Description "Debian 3.1r8 Released 12 April 2008";
        CodeName "sarge";
        OverrideCodeName "sarge";
        Priority "2";
@@ -450,7 +481,6 @@ Suite
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -631,6 +661,7 @@ SuiteMappings
  "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
+ "map stable-proposed-updates proposed-updates";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -661,6 +692,13 @@ AutomaticByHandPackages {
     Extension "tar.gz";
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
   };
+
+  "task-overrides" {
+    Source "tasksel";
+    Section "byhand";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task";
+  };
 };
 
 Dir
@@ -676,7 +714,7 @@ Dir
   MorgueReject "reject";
   Override "/srv/ftp.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
-  UrgencyLog "/srv/ftp.debian.org/testing/urgencies/";
+  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   Queue
   {
     Accepted "/srv/ftp.debian.org/queue/accepted/";