[JJ, r=JT] ignore stderr when finding copyright with dpkg-deb

[dak.git] / config / debian-non-US / dak.conf

diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf
index 9763d1be9e9d223fcaa967f21080eeb19bb9a1d8..be2527e56bc535101d62b0fe3e35724f1715dec2 100644 (file)
--- a/config/debian-non-US/dak.conf
+++ b/config/debian-non-US/dak.conf
@@ -1,7 +1,9 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   GPGKeyring {
+      "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+      "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+   };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "1DB114E0";
@@ -13,9 +15,8 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/non-us.debian.org/katie/lock";
+   LockFile "/org/non-us.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
-   GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -29,30 +30,30 @@ Dinstall
    };
 };
 
-Lauren
+Reject-Proposed-Updates
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r5/";
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
+  KnownPostgres "udmsearch,postgres,www-data,dak,auric";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
 };
 
 
-Catherine 
+Poolize
 {
   Options 
   {
@@ -60,7 +61,7 @@ Catherine
   };
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -71,7 +72,7 @@ Natalie
  ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -82,16 +83,16 @@ Melanie
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/non-us.debian.org/katie/neve-files/";
+  ExportDir "/org/non-us.debian.org/dak/import-archive-files/";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
 Suite
@@ -122,9 +123,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0r4";
+       Version "3.0r5";
        Origin "Debian";
-       Description "Debian 3.0r4 Released 31st December 2004";
+       Description "Debian 3.0r5 Released 15th April 2005";
        CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";
@@ -158,7 +159,7 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+       CopyDotDak "/org/non-us.debian.org/queue/proposed-updates/";
        Version "3.0-updates";
        Origin "Debian";
        Description "Debian 3.0 Proposed Updates - Not Released";
@@ -323,7 +324,7 @@ Dir
   Root "/org/non-us.debian.org/ftp/";
   Pool "/org/non-us.debian.org/ftp/pool/";
   PoolRoot "pool/";
-  Templates "/org/non-us.debian.org/katie/templates/";
+  Templates "/org/non-us.debian.org/dak/templates/";
   Override "/org/non-us.debian.org/scripts/override/";
   Lists "/org/non-us.debian.org/database/dists/";
   Log "/org/non-us.debian.org/log/";