add the silent maps for the code name based stuff

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 959f2db59db730b93486c298834c6bd5a61f4885..7c175ae4f37d6a5aee351102cd5472f23a75f592 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -6,10 +6,9 @@ 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 "Archive Administrator <installer@ftp-master.debian.org>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -55,11 +54,6 @@ Generate-Index-Diffs
    };
 };
 
-Override
-{
-   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
-};
-
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
@@ -106,7 +100,6 @@ Rm
     Suite "unstable";
    };
 
-   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/srv/ftp.debian.org/web/removals.txt";
    LogFile822 "/srv/ftp.debian.org/web/removals.822";
    Bcc "removed-packages@qa.debian.org";
@@ -175,6 +168,16 @@ Check-Overrides
 
 Suite
 {
+  OldStable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+  };
+
   Stable
   {
        Components
@@ -185,6 +188,27 @@ Suite
        };
   };
 
+  OldStable-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           OldStable;
+         };
+         Enhances
+          {
+           OldStable;
+         };
+       };
+  };
+
   Proposed-Updates
   {
        Components
@@ -252,7 +276,7 @@ Suite
        };
   };
 
-  Squeeze-Volatile
+  Squeeze-Updates
   {
        Components
        {
@@ -265,11 +289,17 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Testing;
          };
+      MustBeOlderThan
+      {
+        Testing;
+        Testing-Proposed-Updates;
+        Unstable;
+        Experimental;
+      };
          Enhances
       {
-           Testing;
+           Stable;
          };
        };
 
@@ -322,25 +352,29 @@ 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";
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+ "silent-map lenny-security oldstable-security";
+ "silent-map squeeze-security stable-security";
+ "silent-map wheezy-security testing-security";
 };
 
 AutomaticByHandPackages {
@@ -364,6 +398,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
@@ -371,6 +411,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/";
@@ -394,9 +435,9 @@ Dir
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
     Newstage "/srv/ftp-master.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-    Embargoed "/does/not/exist/";
-    Unembargoed "/does/not/exist/";
-    Disembargo "/does/not/exist/";
+    Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
   };
 };