X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=d5a7df219e7626abca60af5ea247d4eb75a8f732;hb=330833cdf958e43962e208f8021e0e44f1fc100c;hp=5e8f206d8df1c3dc553369745f1faf86e901e6e6;hpb=847d581f684595642a21857fe1ef03b76edf346e;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 5e8f206d..d5a7df21 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -3,6 +3,7 @@ Dinstall
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
+      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
@@ -25,6 +26,7 @@ Dinstall
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
    DefaultSuite "unstable";
+   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
    {
      unstable;
@@ -32,9 +34,15 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
+     ReleaseTransitions "/srv/ftp.debian.org/testing/hints/transitions.yaml";
    };
 };
 
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};
+
 Binary-Upload-Restrictions
 {
  Components
@@ -88,6 +96,11 @@ Mirror-Split
   };
 };
 
+Show-New
+{
+  HTMLPath "/srv/ftp.debian.org/web/new/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -136,7 +149,7 @@ Import-Archive
 Reject-Proposed-Updates
 {
    StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r1/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/";
 };
 
 Import-LDAP-Fingerprints
@@ -214,9 +227,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.1r6";
+	Version "3.1r8";
 	Origin "Debian";
-	Description "Debian 3.1r6 Released 7 April 2007";
+	Description "Debian 3.1r8 Released 12 April 2008";
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "2";
@@ -312,9 +325,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "4.0r1";
+	// Version "4.0r1";
 	Origin "Debian";
-	Description "Debian 4.0r1 Released 15 August 2007";
+	// Description "Debian 4.0r1 Released 15 August 2007";
 	CodeName "etch";
 	OverrideCodeName "etch";
 	Priority "5";
@@ -400,6 +413,7 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -437,6 +451,7 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -522,6 +537,7 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  hurd-i386;
 	  i386;
@@ -571,6 +587,7 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  hurd-i386;
 	  i386;
@@ -619,6 +636,7 @@ SuiteMappings
  "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 stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -630,12 +648,19 @@ SuiteMappings
 
 AutomaticByHandPackages {
   "debian-installer-images" {
-    Source "xxx-debian-installer";
+    Source "debian-installer";
     Section "raw-installer";
     Extension "tar.gz";
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
   };
 
+  "debian-maintainers" {
+    Source "debian-maintainers";
+    Section "raw-keyring";
+    Extension "gpg";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm";
+  };
+
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";