From 458a589244b828d7047df94307083076c6faeb05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Thu, 29 Jan 2004 00:39:07 +0000
Subject: [PATCH] - Remove kernel cruft. - Fix sorting in list2cds and cds2src
 (problematic with perl 5.8 and random   hashes).

---
 tasks/exclude-sarge       | 33 ++++++++++++++++++++++++++++++---
 tasks/unexclude-CD2-sarge |  3 ---
 tools/cds2src             |  2 +-
 tools/list2cds            |  2 +-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/tasks/exclude-sarge b/tasks/exclude-sarge
index 801b297e..9056891a 100644
--- a/tasks/exclude-sarge
+++ b/tasks/exclude-sarge
@@ -4,9 +4,36 @@ kernel-image-2.2.20-compact
 kernel-image-2.2.20-idepci
 kernel-image-2.2.20-reiserfs
 kernel-image-2.4.18-bf2.4
-kernel-image-2.6.0-test1-1-386
-kernel-image-2.6.0-test2-1-386
-emacs20
+kernel-image-2.6.0-test11-1-386
+kernel-image-2.6.0-test9-1-386
+kernel-image-2.4.20-3-386
+kernel-image-2.4.20-3-586tsc
+kernel-image-2.4.20-3-686
+kernel-image-2.4.20-3-686-smp
+kernel-image-2.4.20-3-k6
+kernel-image-2.4.20-3-k7
+kernel-image-2.4.20-3-k7-smp
+kernel-image-2.4.21-5-386
+kernel-image-2.4.21-5-586tsc
+kernel-image-2.4.21-5-686
+kernel-image-2.4.21-5-686-smp
+kernel-image-2.4.21-5-k6
+kernel-image-2.4.21-5-k7
+kernel-image-2.4.21-5-k7-smp
+kernel-image-2.4.22-1-386
+kernel-image-2.4.22-1-586tsc
+kernel-image-2.4.22-1-686
+kernel-image-2.4.22-1-686-smp
+kernel-image-2.4.22-1-k6
+kernel-image-2.4.22-1-k7
+kernel-image-2.4.22-1-k7-smp
+kernel-image-2.4.23-1-386
+kernel-image-2.4.23-1-586tsc
+kernel-image-2.4.23-1-686
+kernel-image-2.4.23-1-686-smp
+kernel-image-2.4.23-1-k6
+kernel-image-2.4.23-1-k7
+kernel-image-2.4.23-1-k7-smp
 aspell-pt
 aspell-fr
 aspell-es
diff --git a/tasks/unexclude-CD2-sarge b/tasks/unexclude-CD2-sarge
index 801b297e..65bde850 100644
--- a/tasks/unexclude-CD2-sarge
+++ b/tasks/unexclude-CD2-sarge
@@ -4,9 +4,6 @@ kernel-image-2.2.20-compact
 kernel-image-2.2.20-idepci
 kernel-image-2.2.20-reiserfs
 kernel-image-2.4.18-bf2.4
-kernel-image-2.6.0-test1-1-386
-kernel-image-2.6.0-test2-1-386
-emacs20
 aspell-pt
 aspell-fr
 aspell-es
diff --git a/tools/cds2src b/tools/cds2src
index 037b846e..50284cc7 100755
--- a/tools/cds2src
+++ b/tools/cds2src
@@ -268,7 +268,7 @@ if ($extranonfree and (! $nonfree))
 }
 
 # Now write the lists down
-foreach (keys %cds) {
+foreach (sort {$a <=> $b} keys %cds) {
         my $count = 0;
         open(CDLIST, "> $sdir/$_.sources") 
                         || die "Can't write in $sdir/$_.sources: $!\n";
diff --git a/tools/list2cds b/tools/list2cds
index 6585b73e..993163a7 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -282,7 +282,7 @@ foreach (glob("$dir/*.packages")) {
 }
 
 # Now write the lists down
-foreach (keys %cds) {
+foreach (sort { $a <=> $b } keys %cds) {
 	my $count = 0;
 	open(CDLIST, "> $dir/$_.packages") 
 			|| die "Can't write in $dir/$_.packages: $!\n";