Merge commit 'origin/master'

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 60df7567f568ba1bb441c2277a4f4ab12d37dad0..b95fa633dc527e525a7b0ca314f4a33ccb032d90 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,7 +1,7 @@
 Dinstall
 {
    GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
@@ -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;
@@ -712,9 +712,3 @@ Urgency
     critical;
   };
 };
-
-Contents
-{
-  Header "contents";
-  Root "/srv/ftp.debian.org/ftp/";
-}
\ No newline at end of file