From 3969a9bed123bd6f9f5168bc853ee34182504c4c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Jul 2004 23:20:58 +0000 Subject: [PATCH] - Switch CONF.sh to sarge. - Uncomment exclude lines. --- CONF.sh | 8 +-- debian/changelog | 2 + tasks/unexclude-CD2-sarge | 119 +++++++++++++++++++++++++++++++------- 3 files changed, 105 insertions(+), 24 deletions(-) diff --git a/CONF.sh b/CONF.sh index 8918b586..91421f67 100644 --- a/CONF.sh +++ b/CONF.sh @@ -48,8 +48,8 @@ unset MAXCDS || true # Where I am (hoping I'm in the debian-cd dir) export BASEDIR=`pwd` -# Building woody cd set ... -export CODENAME=woody +# Building sarge cd set ... +export CODENAME=sarge # By default use Debian installer packages from $CODENAME if [ ! "$DI_CODENAME" ] @@ -164,9 +164,9 @@ export DEFBINSIZE=630 export DEFSRCSIZE=635 # We don't want certain packages to take up space on CD1... -#export EXCLUDE="$BASEDIR"/tasks/exclude-potato +export EXCLUDE="$BASEDIR"/tasks/exclude-sarge # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x) -#export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-potato +export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge # Any packages listed in EXCLUDE but not in any UNEXCLUDE will be # excluded completely. diff --git a/debian/changelog b/debian/changelog index dc963e0d..1b46850f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low - NORECOMMENDS should be used for sarge official CD sets (getting full tasks is more important), and is on by default. - Add libfribidi0 to generate_di+k_list, needed for BIDI. + - Switch CONF.sh to sarge. + - Uncomment exclude lines. * Petter Reinholdtsen - Regenereated tasks/popularity-contest-sarge based on the current data. - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we diff --git a/tasks/unexclude-CD2-sarge b/tasks/unexclude-CD2-sarge index 65bde850..2739f606 100644 --- a/tasks/unexclude-CD2-sarge +++ b/tasks/unexclude-CD2-sarge @@ -1,25 +1,104 @@ -kernel-source-2.2.20 -kernel-image-2.2.20 -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 -aspell-pt -aspell-fr -aspell-es -aspell-de -aspell-da -aspell-el +acorn-fdisk aspell-bg -aspell-cy aspell-br -timidity-patches -xserver-xfree86-dbg +aspell-cy +aspell-da +aspell-de +aspell-el +aspell-es +aspell-fr +aspell-pt +cfdisk-utf8 gcc272 -tk8.0 -tk8.2 -tcl8.0 -tcl8.2 +kernel-image-2.4-386 +kernel-image-2.4-586tsc +kernel-image-2.4-686 +kernel-image-2.4-686-smp +kernel-image-2.4-k6 +kernel-image-2.4-k7 +kernel-image-2.4-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.24-1-386 +kernel-image-2.4.24-1-586tsc +kernel-image-2.4.24-1-686 +kernel-image-2.4.24-1-686-smp +kernel-image-2.4.24-1-k6 +kernel-image-2.4.24-1-k7 +kernel-image-2.4.24-1-k7-smp +kernel-image-2.4.24-speakup +kernel-image-2.4.26-speakup +kernel-image-2.4.25-1-386 +kernel-image-2.4.25-1-586tsc +kernel-image-2.4.25-1-686 +kernel-image-2.4.25-1-686-smp +kernel-image-2.4.25-1-k6 +kernel-image-2.4.25-1-k7 +kernel-image-2.4.25-1-k7-smp +kernel-image-2.4.26-1-586tsc +kernel-image-2.4.26-1-686 +kernel-image-2.4.26-1-686-smp +kernel-image-2.4.26-1-k6 +kernel-image-2.4.26-1-k7 +kernel-image-2.4.26-1-k7-smp +kernel-image-2.6-386 +kernel-image-2.6-686 +kernel-image-2.6-686-smp +kernel-image-2.6-k7 +kernel-image-2.6-k7-smp +kernel-image-2.6.3-1-386 +kernel-image-2.6.3-1-686 +kernel-image-2.6.3-1-686-smp +kernel-image-2.6.3-1-k7 +kernel-image-2.6.3-1-k7-smp +kernel-image-2.6.5-1-386 +kernel-image-2.6.5-1-686 +kernel-image-2.6.5-1-686-smp +kernel-image-2.6.5-1-k7 +kernel-image-2.6.5-1-k7-smp +kernel-image-2.6.6-1-686 +kernel-image-2.6.6-1-686-smp +kernel-image-2.6.6-1-k7 +kernel-image-2.6.6-1-k7-smp +kernel-image-2.6.7-1-686 +kernel-image-2.6.7-1-686-smp +kernel-image-2.6.7-1-k7 +kernel-image-2.6.7-1-k7-smp +kernel-pcmcia-modules-2.4-386 +kernel-pcmcia-modules-2.4-586tsc +kernel-pcmcia-modules-2.4-686 +kernel-pcmcia-modules-2.4-686-smp +kernel-pcmcia-modules-2.4-k6 +kernel-pcmcia-modules-2.4-k7 +kernel-pcmcia-modules-2.4-k7-smp +kernel-pcmcia-modules-2.4.24-1-386 +kernel-pcmcia-modules-2.4.24-1-586tsc +kernel-pcmcia-modules-2.4.24-1-686 +kernel-pcmcia-modules-2.4.24-1-686-smp +kernel-pcmcia-modules-2.4.24-1-k6 +kernel-pcmcia-modules-2.4.24-1-k7 +kernel-pcmcia-modules-2.4.24-1-k7-smp +kernel-pcmcia-modules-2.4.25-1-386 +kernel-pcmcia-modules-2.4.25-1-586tsc +kernel-pcmcia-modules-2.4.25-1-686 +kernel-pcmcia-modules-2.4.25-1-686-smp +kernel-pcmcia-modules-2.4.25-1-k6 +kernel-pcmcia-modules-2.4.25-1-k7 +kernel-pcmcia-modules-2.4.25-1-k7-smp +kernel-pcmcia-modules-2.4.26-1-586tsc +kernel-pcmcia-modules-2.4.26-1-686 +kernel-pcmcia-modules-2.4.26-1-686-smp +kernel-pcmcia-modules-2.4.26-1-k6 +kernel-pcmcia-modules-2.4.26-1-k7 +kernel-pcmcia-modules-2.4.26-1-k7-smp python2.1 -zmailer smail +tcl8.0 +tk8.0 +xserver-xfree86-dbg +zmailer