X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=345565b3e2b18f631bb0548a02ecab45658efad8;hb=af486e867c2809515c09ae4f854a95355112010e;hp=b8e1a4811f49a3e0a507f48feb844c8c516493ab;hpb=2c92f33b772a51832d558bb8ab9112b35476c7fa;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b8e1a481..345565b3 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -24,7 +24,6 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
@@ -43,56 +42,6 @@ Transitions
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
 Generate-Index-Diffs
 {
    Options
@@ -177,11 +126,19 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
 };
 
 Import-LDAP-Fingerprints
@@ -234,104 +191,6 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Version "3.1r8";
-	Origin "Debian";
-	Description "Debian 3.1r8 Released 12 April 2008";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
-	Priority "2";
-	Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
-	UdebComponents
-	{
-	  main;
-	};
-  };
-
-  Oldstable-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	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 "3.1-updates";
-	Origin "Debian";
-	Description "Debian 3.1 Proposed Updates - Not Released";
-	CodeName "sarge-proposed-updates";
-	OverrideCodeName "sarge";
-	OverrideSuite "oldstable";
-	Priority "2";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Oldstable;
-	  };
-	  MustBeOlderThan
-	  {
-	    Stable;
-	    Testing;
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    Oldstable;
-	  };
-	};
-	UdebComponents
-	{
-	  main;
-	};
-  };
-
   Stable
   {
 	Components
@@ -364,7 +223,7 @@ Suite
 	OverrideCodeName "etch";
 	Priority "5";
 	Untouchable "1";
-        ChangeLogBase "dists/stable/";
+	ChangeLogBase "dists/stable/";
 	UdebComponents
 	{
 	  main;
@@ -498,7 +357,7 @@ Suite
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
-	CodeName "testing-proposed-updates";
+	CodeName "lenny-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
@@ -555,7 +414,6 @@ Suite
 	};
   };
 
-
   Unstable
   {
 	Components
@@ -576,7 +434,6 @@ Suite
 	  hurd-i386;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -627,7 +484,6 @@ Suite
 	  hurd-i386;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -665,11 +521,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";
@@ -741,6 +597,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";