Pending merge

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3076a231f87eab9eceab9bb8be3452b814eae8e3..6a989215edf8721a2a8dabb819ec604c1fde850e 100644 (file)
--- 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;
@@ -88,6 +90,11 @@ Mirror-Split
   };
 };
 
+Show-New
+{
+  HTMLPath "/srv/ftp.debian.org/web/new/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -136,7 +143,7 @@ Import-Archive
 Reject-Proposed-Updates
 {
    StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r6/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/";
 };
 
 Import-LDAP-Fingerprints
@@ -221,6 +228,7 @@ Suite
        OverrideCodeName "sarge";
        Priority "2";
        Untouchable "1";
+        ChangeLogBase "dists/oldstable/";
        UdebComponents
        {
          main;
@@ -252,7 +260,7 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       CopyChanges "dists/proposed-updates/";
+       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";
@@ -311,13 +319,14 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "4.0r0";
+       // Version "4.0r1";
        Origin "Debian";
-       Description "Debian 4.0r0 Released 8 April 2007";
+       // Description "Debian 4.0r1 Released 15 August 2007";
        CodeName "etch";
        OverrideCodeName "etch";
        Priority "5";
        Untouchable "1";
+        ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
@@ -520,6 +529,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          hurd-i386;
          i386;
@@ -569,6 +579,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          hurd-i386;
          i386;
@@ -626,6 +637,29 @@ SuiteMappings
  "map-unreleased testing-proposed-updates unstable";
 };
 
+AutomaticByHandPackages {
+  "debian-installer-images" {
+    Source "xxx-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";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
+  };
+};
+
 Dir
 {
   Root "/srv/ftp.debian.org/ftp/";