Merge branch 'master' into bpo

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 00f0bd1ab294f52450fc08bf7ea926180706ccd5..dae2c9d987bba732c21e265b56d40cac9c89e5a8 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -146,7 +146,7 @@ Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
 };
 
 Import-LDAP-Fingerprints
@@ -199,7 +199,7 @@ Check-Overrides
 
 Suite
 {
-  Stable
+  OldStable
   {
        Components
        {
@@ -231,6 +231,107 @@ Suite
        OverrideCodeName "etch";
        Priority "5";
        Untouchable "1";
+       ChangeLogBase "dists/oldstable/";
+       UdebComponents
+       {
+         main;
+         non-free;
+       };
+  };
+
+  Oldstable-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         alpha;
+         amd64;
+         arm;
+         hppa;
+         i386;
+         ia64;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       CopyChanges "dists/oldstable-proposed-updates/";
+       CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
+       CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
+       Version "4.0-updates";
+       Origin "Debian";
+       Description "Debian 4.0 Proposed Updates - Not Released";
+       CodeName "etch-proposed-updates";
+       OverrideCodeName "etch";
+       OverrideSuite "oldstable";
+       ValidTime 604800; // 7 days
+       Priority "4";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           OldStable;
+         };
+         MustBeOlderThan
+         {
+           Stable;
+           Testing;
+           Unstable;
+           Experimental;
+         };
+         Enhances
+          {
+           OldStable;
+         };
+       };
+       UdebComponents
+       {
+         main;
+       };
+  };
+
+  Stable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         alpha;
+         amd64;
+         arm;
+         armel;
+         hppa;
+         i386;
+         ia64;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       // Version "5.0r0";
+       Origin "Debian";
+       // Description "Debian 5.0r0 Released 14 February 2009";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
+       Priority "5";
+       Untouchable "1";
        ChangeLogBase "dists/stable/";
        UdebComponents
        {
@@ -254,6 +355,7 @@ Suite
          alpha;
          amd64;
          arm;
+          armel;
          hppa;
          i386;
          ia64;
@@ -267,11 +369,11 @@ Suite
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
-       Version "4.0-updates";
+       Version "5.0-updates";
        Origin "Debian";
-       Description "Debian 4.0 Proposed Updates - Not Released";
-       CodeName "etch-proposed-updates";
-       OverrideCodeName "etch";
+       Description "Debian 5.0 Proposed Updates - Not Released";
+       CodeName "lenny-proposed-updates";
+       OverrideCodeName "lenny";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days
        Priority "4";
@@ -295,6 +397,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -312,7 +415,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@ -326,8 +428,8 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "lenny";
-       OverrideCodeName "lenny";
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
        ValidTime 604800; // 7 days
        Priority "5";
        UdebComponents
@@ -351,7 +453,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@ -365,8 +466,8 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "lenny-proposed-updates";
-       OverrideCodeName "lenny";
+       CodeName "squeeze-proposed-updates";
+       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
        Priority "6";
@@ -436,7 +537,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@ -486,7 +586,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@ -529,11 +628,11 @@ 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 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";