[dak/master] Oldstable byebye
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian-security/apt.conf | 12 -----------
config/debian-security/cron.buildd | 3 +-
config/debian-security/dak.conf | 38 ------------------------------------
config/debian-security/vars | 2 +-
4 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 7d34e11..2df6072 100644
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,18 +15,6 @@ Default
FileMode 0664;
}
-tree "dists/oldstable/updates"
-{
- FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
- Sections "main contrib non-free";
- Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
- BinOverride "override.sarge.$(SECTION)";
- ExtraOverride "override.sarge.extra.$(SECTION)";
- SrcOverride "override.sarge.$(SECTION).src";
- Contents " ";
-};
-
tree "dists/stable/updates"
{
FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 7e75bcb..6c3e091 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,10 +2,9 @@
#
# Executed after cron.unchecked
-ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390 amd64"
ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
ARCHS_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc sparc s390"
-DISTS="oldstable stable testing"
+DISTS="stable testing"
SSH_SOCKET=~/.ssh/buildd.debian.org.socket
set -e
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6e2ebc7..8cff5ad 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -25,7 +25,6 @@ Dinstall
BXANotify "false";
QueueBuildSuites
{
- oldstable;
stable;
testing;
};
@@ -112,41 +111,6 @@ Suite
// Priority determines which suite is used for the Maintainers file
// as generated by 'dak make-maintainers' (highest wins).
- Oldstable
- {
- Components
- {
- updates/main;
- updates/contrib;
- updates/non-free;
- };
- Architectures
- {
- source;
- all;
- alpha;
- amd64;
- arm;
- hppa;
- i386;
- ia64;
- m68k;
- mips;
- mipsel;
- powerpc;
- s390;
- sparc;
- };
- Announce "dak@security.debian.org";
- Version "3.1";
- Origin "Debian";
- Label "Debian-Security";
- Description "Debian 3.1 Security Updates";
- CodeName "sarge";
- OverrideCodeName "sarge";
- CopyDotDak "/org/security.debian.org/queue/done/";
- };
-
Stable
{
Components
@@ -219,7 +183,6 @@ Suite
SuiteMappings
{
- "silent-map oldstable-security oldstable";
"silent-map stable-security stable";
// JT - FIXME, hackorama
// "silent-map testing-security stable";
@@ -403,7 +366,6 @@ Location
Archive "security";
Suites
{
- Oldstable;
Stable;
Testing;
};
diff --git a/config/debian-security/vars b/config/debian-security/vars
index 2add99e..e475745 100644
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -14,7 +14,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
--
1.5.6.5
Reply to: