Remove oldstable.

diff --git a/apt.conf-security b/apt.conf-security
index 2ae920a3e835727a889eda52af06a427301ae0c1..c412f779e21ca5182364088c4deb3a800edb362e 100644 (file)
--- a/apt.conf-security
+++ b/apt.conf-security
@@ -13,17 +13,6 @@ Default
    FileMode 0664;
 }
 
-tree "dists/oldstable/updates"
-{
-   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)";
-   SrcOverride "override.potato.$(SECTION).src";
-   Contents " ";
-};
-
 tree "dists/stable/updates"
 {
    FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";

diff --git a/apt.conf.stable b/apt.conf.stable
index 2ce546cbd3ac486390023dc243e7fb51a78de32d..319e898d7efccbca972f11a841aa385051fb22e2 100644 (file)
--- a/apt.conf.stable
+++ b/apt.conf.stable
@@ -20,16 +20,6 @@ TreeDefault
    Contents::Header "/org/ftp.debian.org/katie/Contents.top";
 };
 
-tree "dists/oldstable"
-{
-   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";

diff --git a/apt.conf.stable-non-US b/apt.conf.stable-non-US
index 9216e4db8501e42239e21f3db53579c22083ebbd..e5c53426281788bbd0b89bf386b2e9b9f236fc80 100644 (file)
--- a/apt.conf.stable-non-US
+++ b/apt.conf.stable-non-US
@@ -20,16 +20,6 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
-tree "dists/oldstable/non-US"
-{
-   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";
-};
-
 tree "dists/stable/non-US"
 {
    FileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_binary-$(ARCH).list";

diff --git a/cron.buildd-security b/cron.buildd-security
index e05ec3330a494739daead32f603e1c238cc51dbb..9b8cffed714df3ecf38c344f96d2054dc9b8c115 100755 (executable)
--- a/cron.buildd-security
+++ b/cron.buildd-security
@@ -2,11 +2,10 @@
 #
 # Executed after jennifer (merge there??)
 
-ARCHS_oldstable="alpha arm i386 m68k powerpc sparc"
 ARCHS_stable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
 ARCHS_testing="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
-#DISTS="oldstable stable testing"
-DISTS="oldstable stable"
+#DISTS="stable testing"
+DISTS="stable"
 
 set -e
 export SCRIPTVARS=/org/security.debian.org/katie/vars-security
@@ -17,9 +16,6 @@ if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
        apt-ftparchive -qq generate apt.conf.buildd-security
        for d in $DISTS; do
                case "$d" in
-                       oldstable)
-                               ARCHS="$ARCHS_oldstable"
-                               ;;
                        stable)
                                ARCHS="$ARCHS_stable"
                                ;;

diff --git a/cron.daily-security b/cron.daily-security
index 73b308756000b6df681376dbc318453cf598fbee..405b292411a7748fe70489307c39fae71e83d64c 100644 (file)
--- a/cron.daily-security
+++ b/cron.daily-security
@@ -32,7 +32,6 @@ rm -fr non-US
 
 for suite in $suites; do
     case $suite in
-       oldstable) override_suite=potato;;
        stable) override_suite=woody;;
        testing) override_suite=sarge;;
        *) echo "Unknown suite type ($suite)"; exit 1;;
@@ -47,11 +46,6 @@ 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
-                   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
-                       ;;
                    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

diff --git a/katie.conf b/katie.conf
index 541aa22b3a28e82f1c29e4b975fb1f4bd32299f0..ced20342069d30e554c0416e6c188830b0514f3d 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -104,76 +104,6 @@ Rhona
 
 Suite
 {
-  OldStable
-  {
-       Components
-       {
-         main;
-         contrib;
-         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/";
-  };
-
-  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
   {
@@ -248,8 +178,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
          };
          MustBeOlderThan
@@ -424,8 +352,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -440,11 +366,6 @@ 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";

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 403fbc80291e211f9c02edbdca67428746fd923c..ee234514bd43b59096582313704d4b18caa2e187 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -93,76 +93,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
   {
@@ -237,8 +167,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
          };
          MustBeOlderThan
@@ -314,8 +242,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -364,8 +290,6 @@ Suite
        {
          MustBeNewerThan
          {
-           OldStable;
-           Old-Proposed-Updates;
            Stable;
            Proposed-Updates;
            Testing;
@@ -378,11 +302,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";
 

diff --git a/katie.conf-security b/katie.conf-security
index aa8c190ed2e59cfb142a9af9fdc53b88df54117c..bb9516d7b9b066d783baba6b9904eb121c54272a 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,7 +23,6 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -104,35 +103,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  OldStable
-  {
-       Components 
-       {
-         updates/main;
-         updates/contrib;
-         updates/non-free;
-       };
-       Architectures 
-       {
-         source;  
-         all;
-         alpha; 
-         arm;
-         i386;
-         m68k;
-         powerpc;
-         sparc;
-       };
-       Announce "katie@security.debian.org";
-       Version "2.2";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 2.2 Security Updates";
-       CodeName "potato";
-       OverrideCodeName "potato";
-       CopyKatie "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
        Components 
@@ -205,7 +175,6 @@ Suite
 
 SuiteMappings
 {
- "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  "silent-map testing-security stable";
@@ -380,7 +349,6 @@ Location
       Archive "security";
       Suites 
        {
-         OldStable;
          Stable;
          Testing;
         };

diff --git a/vars-security b/vars-security
index 05ccc8c1b3190a1f7da7adc91cc8b9958ed568b8..f042e2ef448f911797fee2a615d701131c3205d2 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="oldstable stable testing"
+suites="stable testing"
 override_types="deb dsc udeb"
 
 PATH=$masterdir:$PATH

diff --git a/wanna-build/trigger.daily b/wanna-build/trigger.daily
index 8a1e4c39c35db40b46ecfe9eb7228edd6f697f55..e69a412a58dd5ab04ee5be426adf77d18447ac3c 100755 (executable)
--- a/wanna-build/trigger.daily
+++ b/wanna-build/trigger.daily
@@ -8,10 +8,9 @@
 #     Sources.* == uncompressed, concat'd version
 PATH="/bin:/usr/bin"
 #testing must be before unstable so late upld don't build for testing needlessly
-DISTS="oldstable-security stable stable-security testing testing-security unstable"
+DISTS="stable stable-security testing testing-security unstable"
 SECTIONS="main contrib non-free"
-ARCHS_oldstable="m68k arm sparc alpha powerpc i386"
-ARCHS_stable="mips mipsel ia64 hppa s390 $ARCHS_oldstable"
+ARCHS_stable="m68k arm sparc alpha powerpc i386 mips mipsel ia64 hppa s390"
 ARCHS_testing="$ARCHS_stable"
 ARCHS_unstable="$ARCHS_testing hurd-i386 sh"
 TMPDIR="/org/wanna-build/tmp"
@@ -51,9 +50,6 @@ cd $TMPDIR
 for d in $DISTS ; do
        dist=`echo $d | sed s/-.*$//`
        case "$dist" in
-               oldstable)
-                       ARCHS="$ARCHS_oldstable"
-                       ;;
                stable)
                        ARCHS="$ARCHS_stable"
                        ;;
@@ -144,25 +140,6 @@ for d in $DISTS ; do
                fi
        done
 
-       if [ "$d" = "oldstable" ]; then
-               gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Sources.gz >> Sources.$d
-               if "$NON_US" = "true" ]; then
-                       rm -f Sources.gz
-                       if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Sources.gz; then
-                               mv Sources.gz Sources-non-us.p-u.gz
-                       fi
-                       gzip -dc Sources-non-us.p-u.gz >> Sources.$d
-                       rm -f Packages.gz
-                       if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Packages.gz; then
-                               mv Packages.gz Packages-non-us.p-u.gz
-                       fi
-               fi
-                       
-               for a in $ARCHS ; do
-                       gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Packages.gz >> Packages.$d.$a
-                       gzip -dc Packages-non-us.p-u.gz >> Packages.$d.$a
-               done
-       fi
        for a in $ARCHS ; do
                if [ "$d" = "unstable" -o ! -e "quinn-unstable.$a-old" ]; then
                        quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.$d -p Packages.$d.$a >> quinn-$d.$a
@@ -179,11 +156,6 @@ for a in $ARCHS_unstable ; do
        for d in $DISTS ; do
                dist=`echo $d | sed s/-.*$//`
                case "$dist" in
-                       oldstable)
-                               if echo $ARCHS_oldstable | grep -q -v "\b$a\b"; then
-                                       continue
-                               fi
-                               ;;
                        stable)
                                if echo $ARCHS_stable | grep -q -v "\b$a\b"; then
                                        continue