sync

diff --git a/katie.conf b/katie.conf
index ccd32f59eb51c3af41b6c92786a1344d85629bc5..b754c5e4680c715eab3b0c2c075677f8e6526f5e 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -1,19 +1,5 @@
 Dinstall
 {
-  Options
-  {
-       Automatic "";
-        Debug "";
-        Help "";
-        Ack-New "";
-        Manual-Reject "";
-        No-Action "";
-        No-Lock "";
-        No-Mail "";
-        Override-Distribution "";
-        Version "";
-   };
-
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -28,156 +14,40 @@ Dinstall
    LockFile "/org/ftp.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-
-};
-
-Heidi
-{
-
-  Options
-  {
-    Add "";
-    Debug "";
-    Help "";
-    List "";
-    Remove "";
-    Set "";
-    Version "";
-   };
-
-};
-
-Catherine
-{
-
-  Options
-  {
-    Debug "";
-    Help "";
-    Limit "";
-    No-Action "";
-    Verbose "";
-    Version "";
-   };
-
-};
-
-Tea
-{
-
-  Options
-  {
-    Debug "";
-    Help "";
-    Version "";
-   };
-
-};
-
-Jenna
-{
-
-  Options
-  {
-    Architecture "";
-    Component "";
-    Debug "";
-    Help "";
-    Suite "";
-    Verbose "";
-    Version "";
-   };
-
-};
-
-Madison
-{
-
-  Options
-  {
-    Architecture "";
-    Debug "";
-    Help "";
-    Maintainer "";
-    Suite "";
-    Version "";
-   };
-
 };
 
 Julia
 {
-
-  Options
-  {
-    Quiet "";
-    Verbose "";
-    Debug "";
-    Help "";
-    Version "";
-   };
-
   ValidGID "800";
   // Comma seperated list of users who are in Postgres but not the passwd file
   KnownPostgres "postgres,katie";
-    
-
 };
 
 Shania
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
     Days 14;
-    Incoming "";
-    Mail "";
-    No-Action "";
-    Verbose "";
    };
-
  MorgueSubDir "shania";
 };
 
 Natalie
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
     Component "main";
-    List "";
     Suite "unstable";
-    Set "";
     Type "deb";
    };
 
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
- LockFile "natalie";
 };
 
 Melanie
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
-    Architecture "";
-    Binary-Only "";
-    Carbon-Copy "";
-    Component "";
-    Done "";
-    No-Action "";
-    Partial "";
-    Reason "";
-    Source-Only "";
     Suite "unstable";
    };
 
@@ -188,22 +58,11 @@ Melanie
 
 Neve
 {
-
   ExportDir "/org/ftp.debian.org/katie/neve-files/";
-
 };
 
 Rhona
 {
-
-  Options
-  {
-        Debug "";
-        Help "";
-       No-Action "";
-        Version "";
-   };
-
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
@@ -212,10 +71,9 @@ Rhona
 
 Suite
 {
-
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
-  
+ 
   Experimental
   {
        Components 
@@ -226,21 +84,21 @@ Suite
        };
        Architectures 
        {
-         "source" ""; 
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "hurd-i386" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "mips" "";
-         "mipsel" "";
-         "powerpc" "";
-         "s390" "";
-         "sh" "";
-         "sparc" "";
+         source ""; 
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         hurd-i386 "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         mips "";
+         mipsel "";
+         powerpc "";
+         s390 "";
+         sh "";
+         sparc "";
        };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
@@ -263,14 +121,14 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         i386 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Announce "debian-changes@lists.debian.org";
        Version "2.2r3";
@@ -287,14 +145,14 @@ Suite
   {
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         i386 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
@@ -317,16 +175,16 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
@@ -345,16 +203,16 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
@@ -373,21 +231,21 @@ Suite
        };
        Architectures 
        {
-         "source" ""; 
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "hurd-i386" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "mips" "";
-         "mipsel" "";
-         "powerpc" "";
-         "s390" "";
-         "sh" "";
-         "sparc" "";
+         source ""; 
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         hurd-i386 "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         mips "";
+         mipsel "";
+         powerpc "";
+         s390 "";
+         sh "";
+         sparc "";
        };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
@@ -485,55 +343,55 @@ Component
 Section
 {
 
-  "admin" "";
-  "base" "";
-  "comm" "";
-  "debian-installer" "";
-  "devel" "";
-  "doc" "";
-  "editors" "";
-  "electronics" "";
-  "games" "";
-  "graphics" "";
-  "hamradio" "";
-  "interpreters" "";
-  "libs" "";
-  "mail" "";
-  "math" "";
-  "misc" "";
-  "net" "";
-  "news" "";
-  "oldlibs" "";
-  "otherosfs" "";
-  "science" "";
-  "shells" "";
-  "sound" "";
-  "tex" "";
-  "text" "";
-  "utils" "";
-  "web" "";
-  "x11" "";
+  admin "";
+  base "";
+  comm "";
+  debian-installer "";
+  devel "";
+  doc "";
+  editors "";
+  electronics "";
+  games "";
+  graphics "";
+  hamradio "";
+  interpreters "";
+  libs "";
+  mail "";
+  math "";
+  misc "";
+  net "";
+  news "";
+  oldlibs "";
+  otherosfs "";
+  science "";
+  shells "";
+  sound "";
+  tex "";
+  text "";
+  utils "";
+  web "";
+  x11 "";
 
 };
 
 Priority
 {
 
-  "required" 1;
-  "important" 2;
-  "standard" 3;
-  "optional" 4;
-  "extra" 5;
-  "source" 0; // i.e. unused
+  required 1;
+  important 2;
+  standard 3;
+  optional 4;
+  extra 5;
+  source 0; // i.e. unused
 
 };
 
 OverrideType
 {
 
-  "deb" "";
-  "udeb" "";
-  "dsc" "";
+  deb "";
+  udeb "";
+  dsc "";
 
 };
 

diff --git a/katie.conf-non-US b/katie.conf-non-US
index c60d64a5c73ce7656b5fd9c690957690df0dcea9..1867de2d245d596360bfc9c1b177fdba899ce41d 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -1,19 +1,5 @@
 Dinstall
 {
-  Options
-  {
-       Automatic "";
-        Debug "";
-        Help "";
-        Ack-New "";
-        Manual-Reject "";
-        No-Action "";
-        No-Lock "";
-        No-Mail "";
-        Override-Distribution "";
-        Version "";
-   };
-
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -28,135 +14,35 @@ Dinstall
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-
 };
 
-Heidi
-{
-
-  Options
-  {
-    Add "";
-    Debug "";
-    Help "";
-    List "";
-    Remove "";
-    Set "";
-    Version "";
-   };
-
-};
-
-Catherine
-{
-
-  Options
-  {
-    Debug "";
-    Help "";
-    Limit "";
-    No-Action "";
-    Version "";
-   };
-
-};
-
-Tea
-{
-
-  Options
-  {
-    Debug "";
-    Help "";
-    Version "";
-   };
-
-};
-
-Jenna
-{
-
-  Options
-  {
-    Architecture "";
-    Component "";
-    Debug "";
-    Help "";
-    Suite "";
-    Verbose "";
-    Version "";
-   };
-
-};
-
-Madison
-{
-
-  Options
-  {
-    Debug "";
-    Help "";
-    Suite "";
-    Version "";
-   };
-
-};
 
 Shania
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
     Days 14;
-    Incoming "";
-    Mail "";
-    No-Action "";
-    Verbose "";
    };
-
  MorgueSubDir "shania";
 };
 
 Natalie
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
     Component "non-US/main";
-    List "";
     Suite "unstable";
-    Set "";
     Type "deb";
    };
-
  ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name
 };
 
 Melanie
 {
-
   Options
   {
-    Debug "";
-    Help "";
-    Version "";
-    Architecture "";
-    Binary-Only "";
-    Component "";
-    Done "";
-    No-Action "";
-    Partial "";
-    Reason "";
-    Source-Only "";
     Suite "unstable";
    };
-
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/home/troup/public_html/removals.txt";
    Bcc "removed-packages@qa.debian.org";
@@ -164,22 +50,11 @@ Melanie
 
 Neve
 {
-
   ExportDir "/org/non-us.debian.org/katie/neve-files/";
-
 };
 
 Rhona
 {
-
-  Options
-  {
-        Debug "";
-        Help "";
-       No-Action "";
-        Version "";
-   };
-
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
@@ -196,14 +71,14 @@ Suite
 //    {
 //     Architectures 
 //     {
-//       "source" "";  
-//       "all" "";
-//       "alpha" ""; 
-//       "arm" "";
-//       "i386" "";
-//       "m68k" "";
-//       "powerpc" "";
-//       "sparc" "";
+//       source "";  
+//       all "";
+//       alpha ""; 
+//       arm "";
+//       i386 "";
+//       m68k "";
+//       powerpc "";
+//       sparc "";
 //     };
 //     Announce "debian-devel-changes@lists.debian.org";
 //     Origin "Debian";
@@ -226,14 +101,14 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         i386 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Announce "debian-changes@lists.debian.org";
        Version "2.2r3";
@@ -250,14 +125,14 @@ Suite
   {
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         i386 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
@@ -280,16 +155,16 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
@@ -308,16 +183,16 @@ Suite
        };
        Architectures 
        {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
+         source "";  
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         powerpc "";
+         sparc "";
        };
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
@@ -336,21 +211,21 @@ Suite
        };
        Architectures 
        {
-         "source" ""; 
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "hppa" "";
-         "hurd-i386" "";
-         "i386" "";
-         "ia64" "";
-         "m68k" "";
-         "mips" "";
-         "mipsel" "";
-         "powerpc" "";
-         "s390" "";
-         "sh" "";
-         "sparc" "";
+         source ""; 
+         all "";
+         alpha ""; 
+         arm "";
+         hppa "";
+         hurd-i386 "";
+         i386 "";
+         ia64 "";
+         m68k "";
+         mips "";
+         mipsel "";
+         powerpc "";
+         s390 "";
+         sh "";
+         sparc "";
        };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
@@ -441,28 +316,28 @@ Component
 Section
 {
 
-  "non-US" "";
+  non-US "";
 
 };
 
 Priority
 {
 
-  "required" 1;
-  "important" 2;
-  "standard" 3;
-  "optional" 4;
-  "extra" 5;
-  "source" 0; // i.e. unused
+  required 1;
+  important 2;
+  standard 3;
+  optional 4;
+  extra 5;
+  source 0; // i.e. unused
 
 };
 
 OverrideType
 {
 
-  "deb" "";
-  "udeb" "";
-  "dsc" "";
+  deb "";
+  udeb "";
+  dsc "";
 
 };