X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=73eea304ea0f71df6d60a5acc8ffdda2b617ae00;hb=64a95c10adb39a67983d5afa1a7bcedbf8645f5a;hp=662d16f649839b36afda3ff380d27821d3224a17;hpb=317c2e8d618daddd49531c18a8367b533c2dd75c;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 662d16f6..73eea304 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -7,9 +7,9 @@ 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";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
-   MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyEmailAddress "Archive Administrator <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -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;
@@ -503,6 +509,7 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+ "reject etch-m68k";
 };
 
 AutomaticByHandPackages {
@@ -560,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/";
   };
 };
@@ -598,6 +606,8 @@ Architectures
   s390 "IBM S/390";
   sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
+  kfreebsd-i386 "GNU/kFreeBSD i386";
+  kfreebsd-amd64 "GNU/kFreeBSD amd64";
 };
 
 Archive