X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=d3b9bada74648680ef54e9d531b351e4684f6dfe;hb=5fe4932c649053a8686d28d10314bc7ee4c104c8;hp=00f0bd1ab294f52450fc08bf7ea926180706ccd5;hpb=a4baee479f3b5d5351d9f873f1bbf8a62028d044;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 00f0bd1a..d3b9bada 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -146,7 +146,7 @@ Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
 };
 
 Import-LDAP-Fingerprints
@@ -199,7 +199,7 @@ Check-Overrides
 
 Suite
 {
-  Stable
+  OldStable
   {
 	Components
 	{
@@ -207,22 +207,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-changes@lists.debian.org";
 	// Version "4.0r1";
 	Origin "Debian";
@@ -231,7 +215,7 @@ Suite
 	OverrideCodeName "etch";
 	Priority "5";
 	Untouchable "1";
-	ChangeLogBase "dists/stable/";
+	ChangeLogBase "dists/oldstable/";
 	UdebComponents
 	{
 	  main;
@@ -239,7 +223,51 @@ Suite
 	};
   };
 
-  Proposed-Updates
+  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
 	{
@@ -247,31 +275,39 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
+	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";
+	Untouchable "1";
+	ChangeLogBase "dists/stable/";
+	UdebComponents
+	{
+	  main;
+	  non-free;
+	};
+  };
+
+  Proposed-Updates
+  {
+	Components
 	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
+	  main;
+	  contrib;
+	  non-free;
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
 	CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
 	CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
-	Version "4.0-updates";
+	Version "5.0-updates";
 	Origin "Debian";
-	Description "Debian 4.0 Proposed Updates - Not Released";
-	CodeName "etch-proposed-updates";
-	OverrideCodeName "etch";
+	Description "Debian 5.0 Proposed Updates - Not Released";
+	CodeName "lenny-proposed-updates";
+	OverrideCodeName "lenny";
 	OverrideSuite "stable";
 	ValidTime 604800; // 7 days
 	Priority "4";
@@ -295,6 +331,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -306,28 +343,11 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
-	CodeName "lenny";
-	OverrideCodeName "lenny";
+	CodeName "squeeze";
+	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
 	UdebComponents
@@ -345,28 +365,11 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
-	CodeName "lenny-proposed-updates";
-	OverrideCodeName "lenny";
+	CodeName "squeeze-proposed-updates";
+	OverrideCodeName "squeeze";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
 	Priority "6";
@@ -403,12 +406,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  m68k;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Etch for m68k - Not Released";
@@ -430,24 +427,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  armel;
-	  hppa;
-	  hurd-i386;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-devel-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Unstable - Not Released";
@@ -480,24 +459,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  armel;
-	  hppa;
-	  hurd-i386;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-devel-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
@@ -529,11 +490,11 @@ 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 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";
@@ -629,6 +590,7 @@ Architectures
   hppa "HP PA RISC";
   amd64 "AMD64";
   arm "ARM";
+  armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
@@ -669,12 +631,6 @@ Component
 	Description "Software that fails to meet the DFSG";
 	MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-	Description "Legacy Mixed";
-	MeetsDFSG "false";
-  };
 };
 
 Section