Merge remote branch 'tolimar/rm-close-bugs' into merge

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 43a8feec49e75ed8009a46bdc08ec0603be95d23..0ba61e394800bf559c7b218fc8e028a50c3f60f8 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,12 +195,6 @@ Suite
          contrib;
          non-free;
        };
-       Origin "Debian";
-       // Description "Debian 5.0r0 Released 14 February 2009";
-       CodeName "lenny";
-       OverrideCodeName "lenny";
-       Priority "5";
-       ChangeLogBase "dists/stable/";
   };
 
   Proposed-Updates
@@ -212,15 +206,9 @@ Suite
          non-free;
        };
        CopyChanges "dists/proposed-updates/";
-       CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-       Origin "Debian";
-       Description "Debian 5.0 Proposed Updates - Not Released";
-       CodeName "lenny-proposed-updates";
-       OverrideCodeName "lenny";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days
-       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
@@ -249,12 +237,7 @@ Suite
          contrib;
          non-free;
        };
-       Origin "Debian";
-       Description "Debian Testing distribution - Not Released";
-       CodeName "squeeze";
-       OverrideCodeName "squeeze";
        ValidTime 604800; // 7 days
-       Priority "5";
   };
 
   Testing-Proposed-Updates
@@ -265,13 +248,8 @@ Suite
          contrib;
          non-free;
        };
-       Origin "Debian";
-       Description "Debian Testing distribution updates - Not Released";
-       CodeName "squeeze-proposed-updates";
-       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
-       Priority "6";
        VersionChecks
        {
          MustBeNewerThan
@@ -301,14 +279,8 @@ Suite
          contrib;
          non-free;
        };
-       Origin "Debian";
-       Description "Volatile Packages for Debian x.y (testing)";
-       CodeName "squeeze-volatile";
-       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
-       NotAutomatic "yes";
-       Priority "0";
        VersionChecks
        {
          MustBeNewerThan
@@ -332,12 +304,7 @@ Suite
          contrib;
          non-free;
        };
-       Origin "Debian";
-       Description "Debian Unstable - Not Released";
-       CodeName "sid";
-       OverrideCodeName "sid";
        ValidTime 604800; // 7 days
-       Priority "7";
        VersionChecks
        {
          MustBeNewerThan
@@ -359,14 +326,8 @@ Suite
          contrib;
          non-free;
        };
-       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";
        VersionChecks
        {
          MustBeNewerThan