Remove overridecodename from dak.conf

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 9f41d69d0f734c184b88e58ede36af51bde91002..b56b90b9bb7e6ae80c9026ab2051b3eb36a9e943 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,19 +195,8 @@ Suite
          contrib;
          non-free;
        };
-       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";
        ChangeLogBase "dists/stable/";
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Proposed-Updates
@@ -218,15 +207,9 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-       Version "5.0-updates";
-       Origin "Debian";
-       Description "Debian 5.0 Proposed Updates - Not Released";
-       CodeName "lenny-proposed-updates";
-       OverrideCodeName "lenny";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days
        Priority "4";
@@ -248,72 +231,6 @@ Suite
            Stable;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
-  };
-
-  Lenny-Volatile
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Announce "debian-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Volatile Packages for Debian 5.0";
-       CodeName "lenny-volatile";
-       OverrideCodeName "lenny";
-       OverrideSuite "stable";
-       ValidTime 604800; // 7 days
-       NotAutomatic "yes";
-       Priority "0";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Stable;
-         };
-         Enhances
-      {
-           Stable;
-         };
-       };
-
-  };
-
-  Lenny-Volatile-Proposed-Updates
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Announce "debian-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Proposed Volatile Packages for Debian 5.0";
-       CodeName "lenny-volatile-proposed-updates";
-       OverrideCodeName "lenny";
-       OverrideSuite "stable";
-       ValidTime 604800; // 7 days
-       NotAutomatic "yes";
-       Priority "0";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Stable;
-         };
-         Enhances
-      {
-           Stable;
-         };
-       };
   };
 
   Testing
@@ -324,18 +241,8 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Testing distribution - Not Released";
-       CodeName "squeeze";
-       OverrideCodeName "squeeze";
        ValidTime 604800; // 7 days
        Priority "5";
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Testing-Proposed-Updates
@@ -346,11 +253,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Testing distribution updates - Not Released";
-       CodeName "squeeze-proposed-updates";
-       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
        Priority "6";
@@ -373,11 +275,6 @@ Suite
            Testing;
           };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Squeeze-Volatile
@@ -388,11 +285,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Volatile Packages for Debian x.y (testing)";
-       CodeName "squeeze-volatile";
-       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
        NotAutomatic "yes";
@@ -412,37 +304,6 @@ Suite
 
   };
 
-  Squeeze-Volatile-Proposed-Updates
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Proposed Volatile Packages for Debian x.y (testing)";
-       CodeName "squeeze-volatile-proposed-updates";
-       OverrideCodeName "squeeze";
-       OverrideSuite "testing";
-       ValidTime 604800; // 7 days
-       NotAutomatic "yes";
-       Priority "0";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Stable;
-           Testing;
-         };
-         Enhances
-      {
-           Testing;
-         };
-       };
-  };
-
   Unstable
   {
        Components
@@ -451,11 +312,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Unstable - Not Released";
-       CodeName "sid";
-       OverrideCodeName "sid";
        ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
@@ -469,11 +325,6 @@ Suite
            Testing-Proposed-Updates;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Experimental
@@ -484,12 +335,7 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Experimental packages - not released; use at your own risk.";
-       CodeName "experimental";
        NotAutomatic "yes";
-       OverrideCodeName "sid";
        OverrideSuite "unstable";
        ValidTime 604800; // 7 days
        Priority "0";
@@ -505,11 +351,6 @@ Suite
            Unstable;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
 };
@@ -520,9 +361,7 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny stable";
- "map lenny-volatile lenny-volatile-proposed-updates";
  "map squeeze testing";
- "map squeeze-volatile squeeze-volatile-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
 // "map oldstable oldstable-proposed-updates";
@@ -569,6 +408,7 @@ Dir
   Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
+  Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
@@ -583,8 +423,6 @@ Dir
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
-    Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new";
-    Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-p-u-new";
     Done "/srv/ftp-master.debian.org/queue/done/";
     Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";
@@ -778,4 +616,6 @@ 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";
 }