Woody release

diff --git a/apt.conf b/apt.conf
index 17cc9010c0af7f4eab2730a95322198170443128..6181945471bcdb646e91521434f9db06c7d938ad 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -20,26 +20,38 @@ TreeDefault
    Contents::Header "/org/ftp.debian.org/katie/Contents.top";
 };
 
-tree "dists/testing"
+tree "dists/proposed-updates"
 {
-   FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
+   FileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.woody.$(SECTION)";
    ExtraOverride "override.woody.extra.$(SECTION)";
    SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
 };
 
-tree "dists/woody-proposed-updates"
+tree "dists/testing"
 {
-   FileList "/org/ftp.debian.org/database/dists/woody-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/woody-proposed-updates_$(SECTION)_source.list";
+   FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   ExtraOverride "override.woody.extra.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   ExtraOverride "override.sarge.extra.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
+};
+
+tree "dists/testing-proposed-updates"
+{
+   FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
+   BinOverride "override.sarge.$(SECTION)";
+   ExtraOverride "override.sarge.extra.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
    Contents " ";
 };
 
@@ -76,12 +88,12 @@ tree "project/experimental"
    Contents " ";
 };
 
-bindirectory "dists/proposed-updates"
+bindirectory "dists/old-proposed-updates"
 {
 
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_-_all.list";
-   Packages "dists/proposed-updates/Packages";
-   Sources "dists/proposed-updates/Sources";
+   FileList "/org/ftp.debian.org/database/dists/old-proposed-updates_-_all.list";
+   Packages "dists/old-proposed-updates/Packages";
+   Sources "dists/old-proposed-updates/Sources";
    Contents " ";
 
    BinOverride "override.potato.all3";

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 9241ffa36773dbc03e66a38c651197a5dd5f5fb2..7a68a4a7f8f4c6402e74f5d232195be14b9ebe0c 100644 (file)
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -20,24 +20,35 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
+tree "dists/proposed-updates/non-US"
+{
+   FileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
+};
+
 tree "dists/testing/non-US"
 {
    FileList "/org/non-us.debian.org/database/dists/testing_non-US/$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/non-us.debian.org/database/dists/testing_non-US/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
 };
 
-tree "dists/woody-proposed-updates/non-US"
+tree "dists/testing-proposed-updates/non-US"
 {
-   FileList "/org/non-us.debian.org/database/dists/woody-proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/non-us.debian.org/database/dists/woody-proposed-updates_non-US/$(SECTION)_source.list";
+   FileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
    Contents " ";
 };
 
@@ -51,16 +62,16 @@ tree "dists/unstable/non-US"
    SrcOverride "override.sid.$(SECTION).src";
 };
 
-bindirectory "dists/proposed-updates"
+bindirectory "dists/old-proposed-updates"
 {
 
-   FileList "/org/non-us.debian.org/database/dists/proposed-updates_-_all.list";
-   Packages "dists/proposed-updates/Packages";
-   Sources "dists/proposed-updates/Sources";
+   FileList "/org/non-us.debian.org/database/dists/old-proposed-updates_-_all.list";
+   Packages "dists/old-proposed-updates/Packages";
+   Sources "dists/old-proposed-updates/Sources";
    Contents " ";
 
    BinOverride "override.potato.all3";
-   BinCacheDB "packages-proposed-updates.db";
+   BinCacheDB "packages-old-proposed-updates.db";
    
    PathPrefix "";
 };

diff --git a/apt.conf-security b/apt.conf-security
index b7c10f9441d26f3a6f0161698080384eb2a93e95..2ae920a3e835727a889eda52af06a427301ae0c1 100644 (file)
--- a/apt.conf-security
+++ b/apt.conf-security
@@ -13,10 +13,10 @@ Default
    FileMode 0664;
 }
 
-tree "dists/stable/updates"
+tree "dists/oldstable/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm i386 m68k powerpc sparc source";
    BinOverride "override.potato.$(SECTION)";
@@ -24,13 +24,24 @@ tree "dists/stable/updates"
    Contents " ";
 };
 
+tree "dists/stable/updates"
+{
+   FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
+};
+
 tree "dists/testing/updates"
 {
    FileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
    Contents " ";
 };

diff --git a/apt.conf.stable b/apt.conf.stable
index b17f062d391e309ff84ee271c7e988036c129587..29311436c84fd443e5b19a00a024d95f923059a1 100644 (file)
--- a/apt.conf.stable
+++ b/apt.conf.stable
@@ -20,12 +20,22 @@ TreeDefault
    Contents::Header "/org/ftp.debian.org/katie/Contents.top";
 };
 
-tree "dists/stable"
+tree "dists/oldstable"
 {
-   FileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_source.list";
+   FileList "/org/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/oldstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm i386 m68k powerpc sparc source";
    BinOverride "override.potato.$(SECTION)";
    SrcOverride "override.potato.$(SECTION).src";
 };
+
+tree "dists/stable"
+{
+   FileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+};

diff --git a/apt.conf.stable-non-US b/apt.conf.stable-non-US
index 42259f1809db38610070c8fb2c7efa3fe5f8c490..9216e4db8501e42239e21f3db53579c22083ebbd 100644 (file)
--- a/apt.conf.stable-non-US
+++ b/apt.conf.stable-non-US
@@ -20,13 +20,22 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
-tree "dists/stable/non-US"
+tree "dists/oldstable/non-US"
 {
-   FileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_source.list";
+   FileList "/org/non-us.debian.org/database/dists/oldstable_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/oldstable_non-US/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm i386 m68k powerpc sparc source";
    BinOverride "override.potato.$(SECTION)";
    SrcOverride "override.potato.$(SECTION).src";
-   External-Links false;
+};
+
+tree "dists/stable/non-US"
+{
+   FileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
 };

diff --git a/cron.daily-security b/cron.daily-security
index 1b55b7a0a6af1f1621b0c087c9954f9aaa24429f..73b308756000b6df681376dbc318453cf598fbee 100644 (file)
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -32,9 +32,10 @@ rm -fr non-US
 
 for suite in $suites; do
     case $suite in
-       stable) override_suite=potato;;
-       testing) override_suite=woody;;
-       *) echo "Unknown suite type"; exit 1;;
+       oldstable) override_suite=potato;;
+       stable) override_suite=woody;;
+       testing) override_suite=sarge;;
+       *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
        for override_type in $override_types; do
@@ -46,14 +47,19 @@ for suite in $suites; do
            if [ ! "$type" = "skip" ]; then
                $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
                case $suite in
-                   stable)
+                   oldstable)
                        $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.woody.$component$type
+                       $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
                        $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                        ;;
-                   testing)
+                   stable)
+                       $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
                        $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                        ;;
-                   *) echo "Unknown suite type"; exit 1;;
+                   testing)
+                       $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+                       ;;
+                   *) echo "Unknown suite type ($suite)"; exit 1;;
                esac
            fi
        done
@@ -61,7 +67,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in potato woody; do
+for dist in potato woody sarge; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer ]; then

diff --git a/katie.conf b/katie.conf
index 07fc7e8a2630aa4a4c40973298836407cf581ca7..6e326198afb18e858153ff3701e5b23531bb54ef 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -24,7 +24,7 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "true";
+   StableDislocationSupport "false";
    AcceptedAutoBuildSuites
    {
      unstable;
@@ -87,7 +87,7 @@ Rhona
 
 Suite
 {
-  Stable
+  OldStable
   {
        Components
        {
@@ -114,36 +114,125 @@ Suite
        OverrideCodeName "potato";
        Priority "1";
        Untouchable "1";
+       ChangeLogBase "dists/oldstable/";
+  };
+
+  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/ftp.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
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         alpha;
+         arm;
+         hppa;
+         i386;
+         ia64;
+         m68k;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       Version "3.0";
+       Origin "Debian";
+       Description "Debian 3.0 Released 20th July 2002";
+       CodeName "woody";
+       OverrideCodeName "woody";
+       Priority "3";
+       Untouchable "1";
        ChangeLogBase "dists/stable/";
   };
 
   Proposed-Updates
   {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
        Architectures
        {
          source;
          all;
          alpha;
          arm;
+         hppa;
          i386;
+         ia64;
          m68k;
+         mips;
+         mipsel;
          powerpc;
+         s390;
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
-       Version "2.2r7";
+       Version "3.0-updates";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r7 - Not Released";
+       Description "Debian 3.0 Proposed Updates - Not Released";
        CodeName "proposed-updates";
-       OverrideCodeName "potato";
+       OverrideCodeName "woody";
        OverrideSuite "stable";
-       Priority "2";
+       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
          {
+           OldStable;
+           Old-Proposed-Updates;
            Stable;
          };
          MustBeOlderThan
@@ -180,12 +269,12 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       Priority "3";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       Priority "5";
   };
 
-  Woody-Proposed-Updates
+  Testing-Proposed-Updates
   {
        Components
        {
@@ -211,10 +300,10 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "woody-proposed-updates";
-       OverrideCodeName "woody";
+       CodeName "testing-proposed-updates";
+       OverrideCodeName "sarge";
        OverrideSuite "unstable";
-       Priority "4";
+       Priority "6";
        VersionChecks
        {
          MustBeNewerThan
@@ -262,7 +351,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
-       Priority "5";
+       Priority "7";
        VersionChecks
        {
          MustBeNewerThan
@@ -270,7 +359,7 @@ Suite
            Stable;
            Proposed-Updates;
            Testing;
-           Woody-Proposed-Updates;
+           Testing-Proposed-Updates;
          };
        };
        UdebComponents
@@ -318,10 +407,12 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
+           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
-           Woody-Proposed-Updates;
+           Testing-Proposed-Updates;
            Unstable;
          };
        };
@@ -332,14 +423,21 @@ Suite
 
 SuiteMappings
 {
+ "map oldstable old-proposed-updates";
+ "map oldstable-security old-proposed-updates";
+ "map-unreleased oldstable stable";
+ "map-unreleased old-proposed-updates stable";
+
+ "map testing-security proposed-updates";
+
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
- "map testing woody-proposed-updates";
- "map testing-security woody-proposed-updates";
+ "map testing testing-proposed-updates";
+ //"map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
- "map-unreleased woody-proposed-updates unstable";
+ "map-unreleased testing-proposed-updates unstable";
 };
 
 Dir
@@ -490,34 +588,7 @@ OverrideType
 Location
 {
 
-  // Old style locations on ftp-master.debian.org
-
-  /org/ftp.debian.org/ftp/project/experimental/
-    {
-      Archive "ftp-master";
-      Suite "experimental";
-      Type "legacy-mixed";
-    };
-
-  /org/ftp.debian.org/ftp/dists/proposed-updates/
-    {
-      Archive "ftp-master";
-      Suite "proposed-updates";
-      Type "legacy-mixed";
-    };
-
-  /org/ftp.debian.org/ftp/dists/
-    {
-      Archive "ftp-master";
-      Suites
-       {
-         Stable;
-         Unstable;
-        };
-      Type "legacy";
-    };
-
-  // New pool locations on ftp-master.debian.org
+  // Pool locations on ftp-master.debian.org
   /org/ftp.debian.org/ftp/pool/
     {
       Archive "ftp-master";

diff --git a/katie.conf-non-US b/katie.conf-non-US
index fd87b4227f67e51b70ea1185c6f7e7a84a53fdc4..32b3c74ccddef52f665e2319d1b995c0e75d4283 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -24,7 +24,7 @@ Dinstall
    CloseBugs "true";
    SuiteSuffix "non-US";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "true";
+   StableDislocationSupport "false";
 };
 
 Julia
@@ -89,7 +89,7 @@ Rhona
 
 Suite
 {
-  Stable
+  OldStable
   {
        Components 
        {
@@ -116,36 +116,125 @@ Suite
        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
+  {
+       Components 
+       {
+         non-US/main;
+         non-US/contrib;
+         non-US/non-free;
+       };
+       Architectures 
+       {
+         source;  
+         all;
+         alpha; 
+         arm;
+         hppa;
+         i386;
+         ia64;
+         m68k;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       Version "3.0";
+       Origin "Debian";
+       Description "Debian 3.0 Released 20th July 2002";
+       CodeName "woody";
+       OverrideCodeName "woody";
+       Priority "3";
+       Untouchable "1";
        ChangeLogBase "dists/stable/non-US/";
   };
 
   Proposed-Updates
   {
+       Components 
+       {
+         non-US/main;
+         non-US/contrib;
+         non-US/non-free;
+       };
        Architectures 
        {
          source;  
          all;
          alpha; 
          arm;
+         hppa;
          i386;
+         ia64;
          m68k;
+         mips;
+         mipsel;
          powerpc;
+         s390;
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
-       Version "2.2r7";
+       Version "3.0-updates";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r7 - Not Released";
+       Description "Debian 3.0 Proposed Updates - Not Released";
        CodeName "proposed-updates";
-       OverrideCodeName "potato";
+       OverrideCodeName "woody";
        OverrideSuite "stable";
-       Priority "2";
+       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
          {
+           OldStable;
+           Old-Proposed-Updates;
            Stable;
          };
          MustBeOlderThan
@@ -182,12 +271,12 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       Priority "3";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       Priority "5";
   };
 
-  Woody-Proposed-Updates
+  Testing-Proposed-Updates
   {
        Components 
        {
@@ -213,14 +302,16 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "woody-proposed-updates";
-       OverrideCodeName "woody";
+       CodeName "testing-proposed-updates";
+       OverrideCodeName "sarge";
        OverrideSuite "unstable";
-       Priority "4";
+       Priority "6";
        VersionChecks
        {
          MustBeNewerThan
          {
+           OldStable;
+           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -264,15 +355,17 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
-       Priority "5";
+       Priority "7";
        VersionChecks
        {
          MustBeNewerThan
          {
+           OldStable;
+           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
-           Woody-Proposed-Updates;
+           Testing-Proposed-Updates;
          };
        };
   };
@@ -281,14 +374,22 @@ 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";
+
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
- "map testing woody-proposed-updates";
- "map testing-security woody-proposed-updates";
- "map-unreleased testing unstable-";
- "map-unreleased woody-proposed-updates unstable";
+ "map testing testing-proposed-updates";
+ //"map testing-security testing-proposed-updates";
+ "map-unreleased testing unstable";
+ "map-unreleased testing-proposed-updates unstable";
 };
 
 Dir
@@ -410,27 +511,7 @@ OverrideType
 Location
 {
   
-  // Old style locations on non-US.debian.org
-
-  /org/non-us.debian.org/ftp/dists/proposed-updates/
-    {
-      Archive "non-US";
-      Suite "proposed-updates";
-      Type "legacy-mixed";
-    };
-
-  /org/non-us.debian.org/ftp/dists/
-    {
-      Archive "non-US";
-      Suites 
-       {
-         Stable;
-         Unstable;
-        };
-      Type "legacy";
-    };
-
-  // New pool locations on non-US.debian.org
+  // Pool locations on non-US.debian.org
   /org/non-us.debian.org/ftp/pool/
     {
       Archive "non-US";
@@ -451,4 +532,3 @@ Urgency
     critical;
   };
 };
-

diff --git a/katie.conf-security b/katie.conf-security
index 10ddab8a0eb1826c4bdbeaf17c9b301541407c84..384246c82d6f0d015f5bc32d6fd75719b31d94c2 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,6 +23,7 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -30,8 +31,8 @@ Dinstall
    DefaultSuite "Testing";
    SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
-   StableDislocationSupport "true";
-   LegacyStableHasNoSections "true";
+   StableDislocationSupport "false";
+   LegacyStableHasNoSections "false";
 };
 
 Julia
@@ -93,7 +94,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -122,7 +123,7 @@ Suite
        CopyKatie "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components 
        {
@@ -156,12 +157,49 @@ Suite
        CopyKatie "/org/security.debian.org/queue/done/";
   };
 
+  Testing
+  {
+       Components 
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Architectures 
+       {
+         source;  
+         all;
+         alpha; 
+         arm;
+         hppa;
+         i386;
+         ia64;
+         m68k;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "katie@security.debian.org";
+       Version "x.y";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian x.y Security Updates";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       CopyKatie "/org/security.debian.org/queue/done/";
+  };
+
 };
 
 SuiteMappings
 {
+ "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
- "silent-map testing-security testing";
+ // JT - FIXME, hackorama
+ "silent-map testing-security stable";
+ //"silent-map testing-security testing";
 };
 
 Dir

diff --git a/vars b/vars
index 6b8b4eafef4c2f34d4810837c960a02bf31ca0bf..4aa36ddfb3e502a2823986ca5dd64f07a2a0af1b 100644 (file)
--- a/vars
+++ b/vars
@@ -18,7 +18,7 @@ incoming=$base/incoming
 
 ftpgroup=debadmin
 
-copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free woody.extra.contrib woody.extra.main woody.extra.non-free"
+copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sarge.contrib sarge.contrib.src sarge.main sarge.main.src sarge.non-free sarge.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free woody.extra.contrib woody.extra.main woody.extra.non-free sarge.extra.contrib sarge.extra.main sarge.extra.non-free"
 
 PATH=$masterdir:$PATH
 umask 022

diff --git a/vars-non-US b/vars-non-US
index ee81892f60b61c4b394411e09e1afd027d67343e..c69401e24d892a462147d0599705abc0fb2d6df7 100644 (file)
--- a/vars-non-US
+++ b/vars-non-US
@@ -17,7 +17,7 @@ packagesfiles=packagesfiles-non-US
 sourcesfiles=sourcesfiles-non-US
 contentsfiles=contentsfiles-non-US
 
-copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.src sid.non-free sid.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src"
+copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sarge.contrib sarge.contrib.src sarge.main sarge.main.src sarge.non-free sarge.non-free.src sid.contrib sid.contrib.src sid.main sid.main.src sid.non-free sid.non-free.src"
 
 PATH=$masterdir:$PATH
 umask 022

diff --git a/vars-security b/vars-security
index f042e2ef448f911797fee2a615d701131c3205d2..05ccc8c1b3190a1f7da7adc91cc8b9958ed568b8 100644 (file)
--- a/vars-security
+++ b/vars-security
@@ -13,7 +13,7 @@ uploadhost=ftp-master.debian.org
 uploaddir=/pub/UploadQueue/
 
 components="main non-free contrib"
-suites="stable testing"
+suites="oldstable stable testing"
 override_types="deb dsc udeb"
 
 PATH=$masterdir:$PATH