Merge commit 'mhy/lenny-prepare' into merge

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7b7f5e8ebe039ac4a21d62d112eb56989250db9d..765e6e83417d3056f615f244c70cc3374f33d89c 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -24,7 +24,6 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
@@ -43,56 +42,6 @@ Transitions
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
 Generate-Index-Diffs
 {
    Options
@@ -126,6 +75,12 @@ Show-New
   HTMLPath "/srv/ftp.debian.org/web/new/";
 }
 
+Show-Deferred
+{
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  DeferredQueue "/srv/queued/DEFERRED/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -171,11 +126,19 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
 };
 
 Import-LDAP-Fingerprints
@@ -228,7 +191,7 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
+  OldStable
   {
        Components
        {
@@ -241,11 +204,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -253,17 +216,18 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r8";
+       // Version "4.0r1";
        Origin "Debian";
-       Description "Debian 3.1r8 Released 12 April 2008";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
-       Priority "2";
+       // Description "Debian 4.0r1 Released 15 August 2007";
+       CodeName "etch";
+       OverrideCodeName "etch";
+       Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
+       ChangeLogBase "dists/oldstable/";
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -280,11 +244,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -295,18 +259,19 @@ Suite
        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 "3.1-updates";
+       Version "4.0-updates";
        Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "sarge-proposed-updates";
-       OverrideCodeName "sarge";
+       Description "Debian 4.0 Proposed Updates - Not Released";
+       CodeName "etch-proposed-updates";
+       OverrideCodeName "etch";
        OverrideSuite "oldstable";
-       Priority "2";
+       ValidTime 604800; // 7 days
+       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
          {
-           Oldstable;
+           OldStable;
          };
          MustBeOlderThan
          {
@@ -317,7 +282,7 @@ Suite
          };
          Enhances
           {
-           Oldstable;
+           OldStable;
          };
        };
        UdebComponents
@@ -341,6 +306,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          i386;
          ia64;
@@ -351,14 +317,14 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       // Version "4.0r1";
+       // Version "5.0r0";
        Origin "Debian";
-       // Description "Debian 4.0r1 Released 15 August 2007";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       // Description "Debian 5.0r0 Released 14 February 2009";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/stable/";
+       ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
@@ -381,6 +347,7 @@ Suite
          alpha;
          amd64;
          arm;
+          armel;
          hppa;
          i386;
          ia64;
@@ -394,12 +361,13 @@ 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";
        VersionChecks
        {
@@ -421,6 +389,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -438,7 +407,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@ -452,8 +420,9 @@ 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
        {
@@ -476,7 +445,6 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@ -490,9 +458,10 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "testing-proposed-updates";
-       OverrideCodeName "lenny";
+       CodeName "squeeze-proposed-updates";
+       OverrideCodeName "squeeze";
        OverrideSuite "testing";
+       ValidTime 604800; // 7 days
        Priority "6";
        VersionChecks
        {
@@ -546,7 +515,6 @@ Suite
        };
   };
 
-
   Unstable
   {
        Components
@@ -561,13 +529,11 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -579,6 +545,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
+       ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
        {
@@ -611,13 +578,11 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -631,6 +596,7 @@ Suite
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";
+       ValidTime 604800; // 7 days
        Priority "0";
        VersionChecks
        {
@@ -730,6 +696,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";