2004-03-05 James Troup <james@nocrew.org> * alicia (main): don't warn about not...

[dak.git] / katie.conf-non-US

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4b6c35a4b5fa9ccd373a5cceb1f6610f0d501a58..490e6eec7a32947d316f963a7752a23a8b34ea0d 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "722F1AED";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -16,7 +16,6 @@ Dinstall
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -24,13 +23,23 @@ Dinstall
    SuiteSuffix "non-US";
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r2/";
 };
 
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,www-data,katie,auric";
+  // Comma separated list of users who are in Postgres but not the passwd file
+  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
 };
 
 Shania
@@ -88,76 +97,6 @@ Rhona
 
 Suite
 {
-  OldStable
-  {
-       Components 
-       {
-         non-US/main;
-         non-US/contrib;
-         non-US/non-free;
-       };
-       Architectures 
-       {
-         source;  
-         all;
-         alpha; 
-         arm;
-         i386;
-         m68k;
-         powerpc;
-         sparc;
-       };
-       Announce "debian-changes@lists.debian.org";
-       Version "2.2r7";
-       Origin "Debian";
-       Description "Debian 2.2r7 Released 12th July 2002";
-       CodeName "potato";
-       OverrideCodeName "potato";
-       Priority "1";
-       Untouchable "1";
-       ChangeLogBase "dists/oldstable/non-US/";
-  };
-
-  Old-Proposed-Updates
-  {
-       Architectures 
-       {
-         source;  
-         all;
-         alpha; 
-         arm;
-         i386;
-         m68k;
-         powerpc;
-         sparc;
-       };
-       Announce "debian-changes@lists.debian.org";
-       CopyChanges "dists/old-proposed-updates/";
-       CopyKatie "/org/non-us.debian.org/queue/old-proposed-updates/";
-       Version "2.2r7";
-       Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r7 - Not Released";
-       CodeName "old-proposed-updates";
-       OverrideCodeName "potato";
-       OverrideSuite "oldstable";
-       Priority "2";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-         };
-         MustBeOlderThan
-         {
-           Stable;
-           Proposed-Updates;
-           Testing;
-           Testing-Proposed-Updates;
-           Unstable;
-           Experimental;
-         };
-       };
-  };
 
   Stable
   {
@@ -184,9 +123,9 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0";
+       Version "3.0r2";
        Origin "Debian";
-       Description "Debian 3.0 Released 20th July 2002";
+       Description "Debian 3.0r2 Released 20th November 2003";
        CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";
@@ -232,8 +171,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
          };
          MustBeOlderThan
@@ -309,8 +246,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -359,8 +294,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -373,11 +306,6 @@ Suite
 
 SuiteMappings
 {
- "map oldstable old-proposed-updates";
- "map oldstable-security old-proposed-updates";
- "map-unreleased oldstable stable";
- "map-unreleased old-proposed-updates stable";
-
  // JT - temp measure
  "map testing-security proposed-updates";
 
@@ -509,11 +437,30 @@ OverrideType
 
 Location
 {
-  
-  // Pool locations on non-US.debian.org
+  /org/non-us.debian.org/ftp/dists/
+    {
+      Archive "non-US";
+      Type "legacy";
+    };
+
+  /org/non-us.debian.org/ftp/dists/old-proposed-updates/
+    {
+      Archive "non-US";
+      Type "legacy-mixed";
+    };
+
   /org/non-us.debian.org/ftp/pool/
     {
       Archive "non-US";
+      Suites 
+       {
+         OldStable;
+         Stable;
+         Proposed-Updates;
+         Testing;
+         Testing-Proposed-Updates;
+         Unstable;
+        };
       Type "pool";
     };