Merge commit 'origin/master'

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3cd6705bdbf25da0a9aaeea5007f0e99d4e29eac..b95fa633dc527e525a7b0ca314f4a33ccb032d90 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -317,12 +317,12 @@ Suite
          {
            Stable;
          };
-         MustBeOlderThan
-         {
-           Testing;
-           Unstable;
-           Experimental;
-         };
+//       MustBeOlderThan
+//       {
+//         Testing;
+//         Unstable;
+//         Experimental;
+//       };
          Enhances
           {
            Stable;
@@ -378,7 +378,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
          };
          MustBeOlderThan
@@ -439,7 +439,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
          };
@@ -473,7 +473,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
            Unstable;
@@ -631,12 +631,6 @@ Component
        Description "Software that fails to meet the DFSG";
        MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-       Description "Legacy Mixed";
-       MeetsDFSG "false";
-  };
 };
 
 Section