Revert "Revert "Merge commit 'stew/content_generation' into merge""

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b1ee215de817d835b3f4087fb767f8d7b439b3ed..b8560c5ef98d93b1c9efd26bfd866fb705edde5b 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,3 +712,9 @@ Urgency
     critical;
   };
 };
+
+Contents
+{
+  Header "contents";
+  Root "/srv/ftp.debian.org/ftp/";
+}
\ No newline at end of file