X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=3581f76046eeea374c224b4bbd5ce1a4689d4a11;hb=ee794150c7fb0a800081c7c6f8cd2c005f15b3d7;hp=9f41d69d0f734c184b88e58ede36af51bde91002;hpb=e15117cd260692b56d3b44f1415fe13f8f1482c1;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 9f41d69d..3581f760 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,19 +195,9 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-changes@lists.debian.org";
-	// Version "5.0r0";
-	Origin "Debian";
-	// Description "Debian 5.0r0 Released 14 February 2009";
-	CodeName "lenny";
 	OverrideCodeName "lenny";
 	Priority "5";
 	ChangeLogBase "dists/stable/";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Proposed-Updates
@@ -218,14 +208,9 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
 	CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
 	CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-	Version "5.0-updates";
-	Origin "Debian";
-	Description "Debian 5.0 Proposed Updates - Not Released";
-	CodeName "lenny-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "stable";
 	ValidTime 604800; // 7 days
@@ -248,72 +233,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
@@ -324,18 +243,9 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Debian Testing distribution - Not Released";
-	CodeName "squeeze";
 	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Testing-Proposed-Updates
@@ -346,10 +256,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Debian Testing distribution updates - Not Released";
-	CodeName "squeeze-proposed-updates";
 	OverrideCodeName "squeeze";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
@@ -373,11 +279,6 @@ Suite
 	    Testing;
           };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Squeeze-Volatile
@@ -388,10 +289,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Volatile Packages for Debian x.y (testing)";
-	CodeName "squeeze-volatile";
 	OverrideCodeName "squeeze";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
@@ -412,37 +309,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
@@ -451,10 +317,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-devel-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Debian Unstable - Not Released";
-	CodeName "sid";
 	OverrideCodeName "sid";
 	ValidTime 604800; // 7 days
 	Priority "7";
@@ -469,11 +331,6 @@ Suite
 	    Testing-Proposed-Updates;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Experimental
@@ -484,10 +341,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Announce "debian-devel-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Experimental packages - not released; use at your own risk.";
-	CodeName "experimental";
 	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
@@ -505,11 +358,6 @@ Suite
 	    Unstable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
 };
@@ -520,9 +368,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";
@@ -569,6 +415,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/";
@@ -583,8 +430,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/";
@@ -778,4 +623,6 @@ Common
 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";
 }