X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6db8add5e7e0bfb9fd23f3c49a88c8b66d328686;hb=7a966c081f8e4b83d1cf4dc4b8cb7ebb0f06dd30;hp=2f21c6befa1110cfa9d5c6879427ed03c6611844;hpb=2151e275b03a09432ab213f0b4feb8b48bd61aa5;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2f21c6be..6db8add5 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -112,6 +112,7 @@ Rm
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/srv/ftp.debian.org/web/removals.txt";
+   LogFile822 "/srv/ftp.debian.org/web/removals.822";
    Bcc "removed-packages@qa.debian.org";
 };
 
@@ -202,11 +203,6 @@ Suite
 	OverrideCodeName "lenny";
 	Priority "5";
 	ChangeLogBase "dists/stable/";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Proposed-Updates
@@ -247,72 +243,6 @@ Suite
 	    Stable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
-  };
-
-  Lenny-Volatile
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Volatile Packages for Debian 5.0";
-	CodeName "lenny-volatile";
-	OverrideCodeName "lenny";
-	OverrideSuite "stable";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
-
-  };
-
-  Lenny-Volatile-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Proposed Volatile Packages for Debian 5.0";
-	CodeName "lenny-volatile-proposed-updates";
-	OverrideCodeName "lenny";
-	OverrideSuite "stable";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
   };
 
   Testing
@@ -330,11 +260,6 @@ Suite
 	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Testing-Proposed-Updates
@@ -372,11 +297,6 @@ Suite
 	    Testing;
           };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Squeeze-Volatile
@@ -411,37 +331,6 @@ Suite
 
   };
 
-  Squeeze-Volatile-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Proposed Volatile Packages for Debian x.y (testing)";
-	CodeName "squeeze-volatile-proposed-updates";
-	OverrideCodeName "squeeze";
-	OverrideSuite "testing";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	    Testing;
-	  };
-	  Enhances
-      {
-	    Testing;
-	  };
-	};
-  };
-
   Unstable
   {
 	Components
@@ -468,11 +357,6 @@ Suite
 	    Testing-Proposed-Updates;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Experimental
@@ -504,11 +388,6 @@ Suite
 	    Unstable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
 };
@@ -519,9 +398,7 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny stable";
- "map lenny-volatile lenny-volatile-proposed-updates";
  "map squeeze testing";
- "map squeeze-volatile squeeze-volatile-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
 // "map oldstable oldstable-proposed-updates";
@@ -568,6 +445,7 @@ Dir
   Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
+  Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
@@ -582,8 +460,6 @@ Dir
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
-    Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new";
-    Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-p-u-new";
     Done "/srv/ftp-master.debian.org/queue/done/";
     Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";
@@ -773,3 +649,10 @@ Common
   // The default number of threads for multithreading parts of dak:
   ThreadCount 16;
 }
+
+Changelogs
+{
+  Testing "/srv/release.debian.org/tools/trille/current-testing";
+  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
+  Export "/srv/ftp-master.debian.org/export/changelogs";
+}