Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 24282855466fc334e6177303fed695192d82ed91..21509aaeaa0d65c859483f9f512c1cf5993882e5 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -7,7 +7,7 @@ Dinstall
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "6070D3A1";
+   SigningKeyIds "55BE302B 6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -47,6 +47,7 @@ Dinstall
 
 Transitions
 {
+   Notifications "debian-devel@lists.debian.org";
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
@@ -172,7 +173,8 @@ Clean-Suites
 
 Process-New
 {
-  AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock";
+  LockDir "/srv/ftp.debian.org/lock/new/";
 };
 
 Check-Overrides
@@ -313,6 +315,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
          };
 //       MustBeOlderThan
@@ -375,6 +378,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -436,6 +440,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -470,6 +475,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -561,6 +567,7 @@ Dir
     New "/srv/ftp.debian.org/queue/new/";
     Reject "/srv/ftp.debian.org/queue/reject/";
     Unchecked "/srv/ftp.debian.org/queue/unchecked/";
+    Newstage "/srv/ftp.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
   };
 };