commit updates from live dak tree on ftp-master

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 50390f5b4b261371ab49c90e12712e8bfaebb223..3076a231f87eab9eceab9bb8be3452b814eae8e3 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,6 +1,6 @@
 Dinstall
 {
-   GPGKeyrings {
+   GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
    };
@@ -39,8 +39,10 @@ Binary-Upload-Restrictions
 {
  Components
  {
-   main;
-   contrib;
+   //main;
+   //contrib;
+   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
+   none;
  };
  unstable
  {
@@ -90,7 +92,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie";
+  KnownPostgres "postgres,dak,katie,release";
 };
 
 Clean-Queues
@@ -134,7 +136,7 @@ Import-Archive
 Reject-Proposed-Updates
 {
    StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r5/";
+   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r6/";
 };
 
 Import-LDAP-Fingerprints
@@ -212,16 +214,20 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0r6";
+       Version "3.1r6";
        Origin "Debian";
-       Description "Debian 3.0r6 Released 31 May 2005";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       Priority "1";
+       Description "Debian 3.1r6 Released 7 April 2007";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       Priority "2";
        Untouchable "1";
+       UdebComponents
+       {
+         main;
+       };
   };
 
-  Stable
+  Oldstable-Proposed-Updates
   {
        Components
        {
@@ -246,17 +252,76 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r5";
+       CopyChanges "dists/proposed-updates/";
+       CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
+       CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
+       Version "3.1-updates";
        Origin "Debian";
-       Description "Debian 3.1r5 Released 17 February 2007";
-       CodeName "sarge";
+       Description "Debian 3.1 Proposed Updates - Not Released";
+       CodeName "sarge-proposed-updates";
        OverrideCodeName "sarge";
-       Priority "3";
+       OverrideSuite "oldstable";
+       Priority "2";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Oldstable;
+         };
+         MustBeOlderThan
+         {
+           Stable;
+           Testing;
+           Unstable;
+           Experimental;
+         };
+         Enhances
+          {
+           Oldstable;
+         };
+       };
+       UdebComponents
+       {
+         main;
+       };
+  };
+
+  Stable
+  {
+       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";
+       Version "4.0r0";
+       Origin "Debian";
+       Description "Debian 4.0r0 Released 8 April 2007";
+       CodeName "etch";
+       OverrideCodeName "etch";
+       Priority "5";
        Untouchable "1";
-       ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -273,11 +338,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -287,11 +352,12 @@ Suite
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
-       Version "3.1-updates";
+       CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
+       Version "4.0-updates";
        Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "proposed-updates";
-       OverrideCodeName "sarge";
+       Description "Debian 4.0 Proposed Updates - Not Released";
+       CodeName "etch-proposed-updates";
+       OverrideCodeName "etch";
        OverrideSuite "stable";
        Priority "4";
        VersionChecks
@@ -335,7 +401,6 @@ Suite
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -345,8 +410,8 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        Priority "5";
        UdebComponents
        {
@@ -384,7 +449,7 @@ Suite
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
        CodeName "testing-proposed-updates";
-       OverrideCodeName "etch";
+       OverrideCodeName "lenny";
        OverrideSuite "testing";
        Priority "6";
        VersionChecks
@@ -412,6 +477,34 @@ Suite
        };
   };
 
+  Etch-m68k
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         m68k;
+       };
+       Announce "debian-testing-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Debian Etch for m68k - Not Released";
+       CodeName "etch-m68k";
+       OverrideCodeName "etch";
+       Priority "5";
+       UdebComponents
+       {
+         main;
+         non-free;
+       };
+  };
+
+
   Unstable
   {
        Components
@@ -517,10 +610,14 @@ Suite
 
 SuiteMappings
 {
+ "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 stable proposed-updates";
  "map stable-security proposed-updates";
+ "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -548,6 +645,7 @@ Dir
     Accepted "/srv/ftp.debian.org/queue/accepted/";
     Byhand "/srv/ftp.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
+    OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";
     Done "/srv/ftp.debian.org/queue/done/";
     Holding "/srv/ftp.debian.org/queue/holding/";
     New "/srv/ftp.debian.org/queue/new/";
@@ -562,12 +660,6 @@ DB
   Name "projectb";
   Host "";
   Port -1;
-
-  NonUSName "projectb";
-  NonUSHost "non-US.debian.org";
-  NonUSPort -1;
-  NonUSUser "auric";
-  NonUSPassword "moo";
 };
 
 Architectures