X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=549878211dd0763757ce3b8b17f311140255c16a;hb=38ef2249fc2f525dd706c4742b003ce056702aef;hp=3cd6705bdbf25da0a9aaeea5007f0e99d4e29eac;hpb=dbf5091efbd9d2b7e7527e48343b43b10d820970;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3cd6705b..54987821 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+   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";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -317,12 +317,12 @@ Suite
 	  {
 	    Stable;
 	  };
-	  MustBeOlderThan
-	  {
-	    Testing;
-	    Unstable;
-	    Experimental;
-	  };
+//	  MustBeOlderThan
+//	  {
+//	    Testing;
+//	    Unstable;
+//	    Experimental;
+//	  };
 	  Enhances
           {
 	    Stable;
@@ -378,7 +378,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	  };
 	  MustBeOlderThan
@@ -439,7 +439,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	    Testing-Proposed-Updates;
 	  };
@@ -473,7 +473,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	    Testing-Proposed-Updates;
 	    Unstable;
@@ -631,12 +631,6 @@ Component
 	Description "Software that fails to meet the DFSG";
 	MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-	Description "Legacy Mixed";
-	MeetsDFSG "false";
-  };
 };
 
 Section