Merge mainline

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3f7366cac58e86869050dee845eb9b9f3512a3e2..d5a7df219e7626abca60af5ea247d4eb75a8f732 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,15 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
+     ReleaseTransitions "/srv/ftp.debian.org/testing/hints/transitions.yaml";
    };
 };
 
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};
+
 Binary-Upload-Restrictions
 {
  Components
@@ -222,9 +227,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";
@@ -631,6 +636,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";