From: Mark Hymers <mhy@debian.org>
Date: Sat, 28 Feb 2009 21:38:55 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1c11b7bd8cf8a93d4e0cbca31e02bdc6257fc4fc;hp=ba2b82d3c453ec3d2ce3e6a91a994b6e4ba51ef3;p=dak.git

Merge commit 'ftpmaster/master'
---

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b1ee215d..54987821 100644
--- 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;