X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=f5424dcca280d65b0b0cc83c86b6a56fff9251bb;hb=70f6c4de94c2d2e1bb76e165a2f15aaf0184215c;hp=b888a6062eee558fb299894644109df97124030e;hpb=44e9d2c405a9d297a4152c32c7b88931af610337;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b888a606..f5424dcc 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -69,7 +69,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -196,17 +196,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	  };
-	  Enhances
-          {
-	    OldStable;
-	  };
-	};
   };
 
   Proposed-Updates
@@ -217,24 +206,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-	  };
-//	  MustBeOlderThan
-//	  {
-//	    Testing;
-//	    Unstable;
-//	    Experimental;
-//	  };
-	  Enhances
-          {
-	    Stable;
-	  };
-	};
   };
 
   Testing
@@ -255,25 +226,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	  };
-	  MustBeOlderThan
-	  {
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    Testing;
-          };
-	};
   };
 
   Squeeze-Updates
@@ -284,25 +236,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-      MustBeOlderThan
-      {
-        Testing;
-        Testing-Proposed-Updates;
-        Unstable;
-        Experimental;
-      };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
-
   };
 
   Unstable
@@ -313,17 +246,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	  };
-	};
   };
 
   Experimental
@@ -334,20 +256,7 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	    Unstable;
-	  };
-	};
   };
-
 };
 
 SuiteMappings
@@ -359,8 +268,12 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny oldstable";
+ "map lenny-proposed-updates oldstable-proposed-updates";
  "map squeeze stable";
+ "map squeeze-proposed-updates proposed-updates";
+ "map squeeze-updates proposed-updates";
  "map wheezy testing";
+ "map wheezy-proposed-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
  "map oldstable oldstable-proposed-updates";
@@ -368,6 +281,7 @@ SuiteMappings
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
+ "map stable-updates proposed-updates";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -418,7 +332,6 @@ Dir
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";