From 8ecb9ff76c84bb82f9289b03ce79aaa939ea2d82 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 24 Nov 2008 10:59:26 +0100 Subject: [PATCH] byebye m68k Signed-off-by: Joerg Jaspert --- ChangeLog | 10 ++++++++++ config/debian/apt.conf | 12 ++++++------ config/debian/dak.conf | 2 -- config/debian/vars | 2 +- scripts/debian/update-ftpstats | 2 +- scripts/nfu/get-w-b-db | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 879b6ed2..04451813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-11-24 Joerg Jaspert + + * scripts/nfu/get-w-b-db: remove m68k + + * scripts/debian/update-ftpstats: remove m68k + + * config/debian/dak.conf: remove m68k + + * config/debian/vars (archs): Remove m68k + 2008-11-23 Joerg Jaspert * dak/process_unchecked.py (check_files): fix this armel mess diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 25486b8b..6884aaab 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -61,7 +61,7 @@ tree "dists/unstable" FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list"; Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; + Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; ExtraOverride "override.sid.extra.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; @@ -121,7 +121,7 @@ tree "dists/unstable/main" { FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc"; + Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; SrcOverride "override.sid.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -133,7 +133,7 @@ tree "dists/unstable/non-free" { FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc"; + Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; SrcOverride "override.sid.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -145,7 +145,7 @@ tree "dists/experimental/main" { FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel m68k powerpc s390 sparc"; + Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; SrcOverride "override.sid.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -157,7 +157,7 @@ tree "dists/experimental/non-free" { FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc"; + Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; SrcOverride "override.sid.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -172,7 +172,7 @@ tree "dists/experimental" FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list"; Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; + Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; Contents " "; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 77f5c918..c5a87ca1 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -477,7 +477,6 @@ Suite hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -528,7 +527,6 @@ Suite hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; diff --git a/config/debian/vars b/config/debian/vars index 69cef765..02fa6123 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -4,7 +4,7 @@ base=/srv/ftp.debian.org ftpdir=$base/ftp webdir=$base/web indices=$ftpdir/indices -archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc" +archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc" scriptdir=$base/scripts masterdir=$base/dak/ diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats index d0d519d5..b9febef0 100755 --- a/scripts/debian/update-ftpstats +++ b/scripts/debian/update-ftpstats @@ -3,7 +3,7 @@ my %data; my %data2; my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "armel", "hppa", - "hurd-i386", "ia64", "m68k", "mips", "mipsel", "powerpc", "s390", + "hurd-i386", "ia64", "mips", "mipsel", "powerpc", "s390", "sparc"); while (<>) { diff --git a/scripts/nfu/get-w-b-db b/scripts/nfu/get-w-b-db index c34e5e38..84c15e26 100755 --- a/scripts/nfu/get-w-b-db +++ b/scripts/nfu/get-w-b-db @@ -14,7 +14,7 @@ fi cd $WB_DB_DIR || { echo "Failed to cd to $WB_DB_DIR" ; exit 1 ;} -for arch in alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc +for arch in alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc do rm -f $arch-all.txt echo "Getting $arch-all.txt" -- 2.39.2