Merge branch 'master' into dbtests

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 8517c0b2d37e7d9dba5e9948801ca51e98675c47..ffa728b56f58afda730eaca19be4e023aec86bff 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -32,7 +32,7 @@ Dinstall
    SkipTime 300;
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
-   OverrideDisparityCheck "true";
+   OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
    Reject
    {
@@ -90,16 +90,18 @@ Check-Overrides
 //      OriginSuite "Unstable";
     };
 
+    lenny-backports-sloppy
+    {
+      Process "1";
+//      OriginSuite "Unstable";
+    };
+
     squeeze-backports
     {
       Process "1";
 //      OriginSuite "Unstable";
     };
 
-//    Unstable
-//    {
-//    Process "0";
-//  };
   };
 };
 
@@ -148,8 +150,8 @@ Rm
     Suite "lenny-backports";
    };
 
-   LogFile "/srv/backports-master.debian.org/ftp/removals.txt";
-   LogFile822 "/srv/backports-master.debian.org/ftp/removals.822";
+   LogFile "/srv/backports-web.debian.org/underlay/removals.txt";
+   LogFile822 "/srv/backports-web.debian.org/underlay/removals.822";
 };
 
 Import-Archive
@@ -183,6 +185,15 @@ Suite
        };
   };
 
+  lenny-backports-sloppy
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+  };
 
   squeeze-backports
   {
@@ -240,8 +251,10 @@ SuiteMappings
 {
  "map lenny lenny-backports";
  "map lenny-bpo lenny-backports";
+ "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
+ "map lenny-backports proposed-updates";
 };
 
 Architectures