X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=2610da38dc94d9a3c697e380746d4a66fb5e3d5b;hb=6d348a7d645a80032bbdb26aafcce0ac687ecd26;hp=d7006c879bf6742c8dc1239eada8af9d2f8413a7;hpb=94728eaa0bfe92f0eb50528a513fafdb2540d831;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index d7006c87..2610da38 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -201,73 +200,6 @@ Check-Overrides
 
 Suite
 {
-  OldStable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	// Version "4.0r1";
-	Origin "Debian";
-	// Description "Debian 4.0r1 Released 15 August 2007";
-	CodeName "etch";
-	OverrideCodeName "etch";
-	Priority "5";
-	ChangeLogBase "dists/oldstable/";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
-  };
-
-  Oldstable-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	CopyChanges "dists/oldstable-proposed-updates/";
-	CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
-	CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
-	Version "4.0-updates";
-	Origin "Debian";
-	Description "Debian 4.0 Proposed Updates - Not Released";
-	CodeName "etch-proposed-updates";
-	OverrideCodeName "etch";
-	OverrideSuite "oldstable";
-	ValidTime 604800; // 7 days
-	Priority "4";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	  };
-	  MustBeOlderThan
-	  {
-	    Stable;
-	    Testing;
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    OldStable;
-	  };
-	};
-	UdebComponents
-	{
-	  main;
-	};
-  };
-
   Stable
   {
 	Components
@@ -400,27 +332,6 @@ Suite
 	};
   };
 
-  Etch-m68k
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Debian Etch for m68k - Not Released";
-	CodeName "etch-m68k";
-	OverrideCodeName "etch";
-	Priority "5";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
-  };
-
   Unstable
   {
 	Components
@@ -494,27 +405,25 @@ Suite
 
 SuiteMappings
 {
- "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map etch oldstable";
  "map lenny stable";
  "map squeeze testing";
  "map sid unstable";
  "map rc-buggy experimental";
- "map oldstable oldstable-proposed-updates";
- "map oldstable-security oldstable-proposed-updates";
+// "map oldstable oldstable-proposed-updates";
+// "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
- "map-unreleased oldstable unstable";
+// "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
- "reject etch-m68k";
 };
 
 AutomaticByHandPackages {
@@ -554,6 +463,7 @@ Dir
   Override "/srv/ftp.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  TempPath "/srv/ftp.debian.org/tmp/";
   Queue
   {
     Byhand "/srv/ftp.debian.org/queue/byhand/";
@@ -743,8 +653,3 @@ Contents
   Header "contents";
   Root "/srv/ftp.debian.org/test/";
 }
-
-TempPath
-{
-   TempPath "/srv/ftp.debian.org/tmp/";
-};