byebye m68k

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4959d445f7f83b401c71b3278aba36bb4e1cb14a..c5a87ca1c885bd800ad3e79f13a314505a0aa709 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,6 +2,7 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -125,6 +126,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";
@@ -183,6 +190,7 @@ Import-LDAP-Fingerprints
   LDAPServer "db.debian.org";
   ExtraKeyrings
   {
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
     "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
     "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
   };
@@ -226,104 +234,6 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
-       Announce "debian-changes@lists.debian.org";
-       Version "3.1r8";
-       Origin "Debian";
-       Description "Debian 3.1r8 Released 12 April 2008";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
-       Priority "2";
-       Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
-       UdebComponents
-       {
-         main;
-       };
-  };
-
-  Oldstable-Proposed-Updates
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         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 "3.1-updates";
-       Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "sarge-proposed-updates";
-       OverrideCodeName "sarge";
-       OverrideSuite "oldstable";
-       Priority "2";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Oldstable;
-         };
-         MustBeOlderThan
-         {
-           Stable;
-           Testing;
-           Unstable;
-           Experimental;
-         };
-         Enhances
-          {
-           Oldstable;
-         };
-       };
-       UdebComponents
-       {
-         main;
-       };
-  };
-
   Stable
   {
        Components
@@ -356,7 +266,7 @@ Suite
        OverrideCodeName "etch";
        Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/stable/";
+       ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
@@ -398,6 +308,7 @@ Suite
        CodeName "etch-proposed-updates";
        OverrideCodeName "etch";
        OverrideSuite "stable";
+       ValidTime 604800; // 7 days
        Priority "4";
        VersionChecks
        {
@@ -452,6 +363,7 @@ Suite
        Description "Debian Testing distribution - Not Released";
        CodeName "lenny";
        OverrideCodeName "lenny";
+       ValidTime 604800; // 7 days
        Priority "5";
        UdebComponents
        {
@@ -491,6 +403,7 @@ Suite
        CodeName "testing-proposed-updates";
        OverrideCodeName "lenny";
        OverrideSuite "testing";
+       ValidTime 604800; // 7 days
        Priority "6";
        VersionChecks
        {
@@ -544,7 +457,6 @@ Suite
        };
   };
 
-
   Unstable
   {
        Components
@@ -565,7 +477,6 @@ Suite
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -577,6 +488,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
+       ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
        {
@@ -615,7 +527,6 @@ Suite
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -629,6 +540,7 @@ Suite
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";
+       ValidTime 604800; // 7 days
        Priority "0";
        VersionChecks
        {
@@ -652,11 +564,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";