Adjust for squeeze.stable

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6447388ecd89c4a9d375b3e0a7374d9f72a21f04..2741eed7852a16562c4714b27fca803e9854a543 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -6,7 +6,6 @@ Dinstall
    };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "55BE302B";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
@@ -169,6 +168,16 @@ Check-Overrides
 
 Suite
 {
+  OldStable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+  };
+
   Stable
   {
        Components
@@ -179,6 +188,27 @@ Suite
        };
   };
 
+  OldStable-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           OldStable;
+         };
+         Enhances
+          {
+           OldStable;
+         };
+       };
+  };
+
   Proposed-Updates
   {
        Components
@@ -246,7 +276,7 @@ Suite
        };
   };
 
-  Squeeze-Volatile
+  Squeeze-Updates
   {
        Components
        {
@@ -259,11 +289,17 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Testing;
          };
+      MustBeOlderThan
+      {
+        Testing;
+        Testing-Proposed-Updates;
+        Unstable;
+        Experimental;
+      };
          Enhances
       {
-           Testing;
+           Stable;
          };
        };
 
@@ -316,19 +352,20 @@ Suite
 
 SuiteMappings
 {
-// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+ "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map lenny stable";
- "map squeeze testing";
+ "map lenny oldstable";
+ "map squeeze stable";
+ "map wheezy testing";
  "map sid unstable";
  "map rc-buggy experimental";
-// "map oldstable oldstable-proposed-updates";
-// "map oldstable-security oldstable-proposed-updates";
+ "map oldstable oldstable-proposed-updates";
+ "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 oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -358,6 +395,12 @@ AutomaticByHandPackages {
     Extension "tar.gz";
     Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
   };
+
+  "win32-loader" {
+    Source "win32-loader";
+    Section "byhand";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader";
+  };
 };
 
 Dir
@@ -365,6 +408,7 @@ Dir
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
+  Export "/srv/ftp-master.debian.org/export/";
   PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";