X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=7c175ae4f37d6a5aee351102cd5472f23a75f592;hb=6dc5f445dac854e7349e76fa6dceb522aa964be1;hp=403d1d59c5c80dc802b0eba3e66d8808d4d7dda9;hpb=d18a7b96c5dbc9954f15c5a0f3b1768f1c75e0f1;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 403d1d59..7c175ae4 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -168,6 +168,16 @@ Check-Overrides
 
 Suite
 {
+  OldStable
+  {
+	Components
+	{
+	  main;
+	  contrib;
+	  non-free;
+	};
+  };
+
   Stable
   {
 	Components
@@ -178,6 +188,27 @@ Suite
 	};
   };
 
+  OldStable-Proposed-Updates
+  {
+	Components
+	{
+	  main;
+	  contrib;
+	  non-free;
+	};
+	VersionChecks
+	{
+	  MustBeNewerThan
+	  {
+	    OldStable;
+	  };
+	  Enhances
+          {
+	    OldStable;
+	  };
+	};
+  };
+
   Proposed-Updates
   {
 	Components
@@ -245,7 +276,7 @@ Suite
 	};
   };
 
-  Squeeze-Volatile
+  Squeeze-Updates
   {
 	Components
 	{
@@ -258,11 +289,17 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Testing;
 	  };
+      MustBeOlderThan
+      {
+        Testing;
+        Testing-Proposed-Updates;
+        Unstable;
+        Experimental;
+      };
 	  Enhances
       {
-	    Testing;
+	    Stable;
 	  };
 	};
 
@@ -315,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 {
@@ -357,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
@@ -364,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/";
@@ -387,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/";
   };
 };
 
@@ -473,5 +521,7 @@ Common
 
 Changelogs
 {
+  Testing "/srv/release.debian.org/tools/trille/current-testing";
   Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
+  Export "/srv/ftp-master.debian.org/export/changelogs";
 }