Revert "Merge commit 'stew/content_generation' into merge"

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index e5a82864f49a4fe6203a5e32f83310192638d603..d3b9bada74648680ef54e9d531b351e4684f6dfe 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,16 +1,14 @@
 Dinstall
 {
    GPGKeyring {
-      "/usr/share/keyrings/debian-keyring.gpg";
-      "/usr/share/keyrings/debian-keyring.pgp";
-      "/usr/share/keyrings/debian-keyring.pgp";
-//      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
+      "/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";
    SigningKeyIds "6070D3A1";
-//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
-   SendmailCommand "/bin/echo -odq -oi -t";
+   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    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()
@@ -209,22 +207,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        // Version "4.0r1";
        Origin "Debian";
@@ -249,22 +231,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/oldstable-proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
@@ -309,23 +275,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        // Version "5.0r0";
        Origin "Debian";
@@ -350,23 +299,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-          armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
@@ -411,22 +343,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
@@ -449,22 +365,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
@@ -506,12 +406,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         m68k;
-       };
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Etch for m68k - Not Released";
@@ -533,23 +427,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         hurd-i386;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Unstable - Not Released";
@@ -582,23 +459,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         hurd-i386;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Experimental packages - not released; use at your own risk.";
@@ -730,6 +590,7 @@ Architectures
   hppa "HP PA RISC";
   amd64 "AMD64";
   arm "ARM";
+  armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
@@ -770,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
@@ -857,8 +712,3 @@ Urgency
     critical;
   };
 };
-
-Content
-{
-  Header "contents"
-}
\ No newline at end of file