X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=e3b927b8301419fb0ee0173e69d756f9de3a1e41;hb=7bd88059a18fba8df5bc0fc281ff3a006f28a9e9;hp=baf140e150a10af319ffaed3d78e7bf0944e0db4;hpb=87bf163d12ec8328d87e1b2a2ca2239221a73bd6;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index baf140e1..e3b927b8 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,7 +47,7 @@ Dinstall
 
 Transitions
 {
-   Notifications "team@release.debian.org";
+   Notifications "debian-devel@lists.debian.org";
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
@@ -173,7 +173,7 @@ Clean-Suites
 
 Process-New
 {
-  DinstallLockFile "/srv/ftp.debian.org/lock/daily.lock";
+  DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock";
   LockDir "/srv/ftp.debian.org/lock/new/";
 };
 
@@ -315,6 +315,7 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
+	    OldStable;
 	    Stable;
 	  };
 //	  MustBeOlderThan
@@ -377,6 +378,7 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
+	    OldStable;
 	    Stable;
 //	    Proposed-Updates;
 	    Testing;
@@ -438,6 +440,7 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
+	    OldStable;
 	    Stable;
 //	    Proposed-Updates;
 	    Testing;
@@ -472,6 +475,7 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
+	    OldStable;
 	    Stable;
 //	    Proposed-Updates;
 	    Testing;
@@ -493,6 +497,11 @@ SuiteMappings
  "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 etch oldstable";
+ "map lenny stable";
+ "map squeeze testing";
+ "map sid unstable";
+ "map rc-buggy experimental";
  "map oldstable oldstable-proposed-updates";
  "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
@@ -600,7 +609,6 @@ Architectures
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
   s390 "IBM S/390";
-  sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
   kfreebsd-i386 "GNU/kFreeBSD i386";
   kfreebsd-amd64 "GNU/kFreeBSD amd64";