From 0f6cbc61ce8dd5f53ff14a0d0f48df473b0e3b38 Mon Sep 17 00:00:00 2001 From: Josip Rodin Date: Fri, 25 Jul 2003 11:14:18 +0000 Subject: [PATCH] integrated whatever was useful in -redhat into -fromcd23 and ditched the rest; more updates and reshuffling in -fromcd23 and forcd1 --- tasks/Debian_potato | 8 ++---- tasks/Debian_sarge | 1 - tasks/Debian_sid | 22 ++++------------ tasks/Debian_woody | 21 ++++++--------- tasks/forcd1 | 7 +++++ tasks/interesting-fromcd23 | 53 +++++++++++++++++++++++++------------- tasks/interesting-redhat | 23 ----------------- 7 files changed, 57 insertions(+), 78 deletions(-) delete mode 100644 tasks/interesting-redhat diff --git a/tasks/Debian_potato b/tasks/Debian_potato index cd476f74..74ceb22e 100644 --- a/tasks/Debian_potato +++ b/tasks/Debian_potato @@ -20,14 +20,10 @@ #include -#include - +/* Packages that may still fit on the first CD */ #include -/* List of packages that may still fit on the first CD */ #include +/* All the remaining packages, sorted per popcon results */ #include - -/* Other packages to put on the others CDs */ - diff --git a/tasks/Debian_sarge b/tasks/Debian_sarge index 00496c38..83d7462a 100644 --- a/tasks/Debian_sarge +++ b/tasks/Debian_sarge @@ -16,7 +16,6 @@ /* Other interesting packages */ #include -#include #include /* The rest ordered by popularity */ diff --git a/tasks/Debian_sid b/tasks/Debian_sid index aa44c298..18fb79f0 100644 --- a/tasks/Debian_sid +++ b/tasks/Debian_sid @@ -1,7 +1,5 @@ -/* Comment - * - * This file will be used to build complete set of Sid CD (unstable) - * +/* + * This file is used to build complete set of unstable (sid) CDs */ /* The CD set does use empty package called task-* @@ -11,22 +9,12 @@ #include "Debian_sid_nonUS" #endif -#include - /* Packages that should really be on CD1 */ #include #include -#include - -#include - +/* Packages that may still fit on the first CD */ #include -/* List of packages that may still fit on the first CD */ -#include - -#include - -/* Other packages to put on the others CDs */ - +/* All the remaining packages, sorted per popcon results */ +#include diff --git a/tasks/Debian_woody b/tasks/Debian_woody index 83e2acfb..0a5f2fe0 100644 --- a/tasks/Debian_woody +++ b/tasks/Debian_woody @@ -1,11 +1,11 @@ -/* Comment - * - * This file will be used to build official complete set of Woody CD - * +/* + * This file is used to build the official set of Debian 3.0 (woody) CDs */ -/* The CD set does use empty package called task-* - to select the packages in the initial installation */ +/* + * The CD set uses empty package called task-* + * to select the packages in the initial installation + */ #if (FORCENONUSONCD1 == 1) #include "Debian_woody_nonUS" @@ -19,14 +19,9 @@ #include -#include - +/* Packages that may still fit on the first CD */ #include - -/* List of packages that may still fit on the first CD */ #include +/* All the remaining packages, sorted per popcon results */ #include - -/* Other packages to put on the others CDs */ - diff --git a/tasks/forcd1 b/tasks/forcd1 index ceb5c16a..783692c5 100644 --- a/tasks/forcd1 +++ b/tasks/forcd1 @@ -2,6 +2,10 @@ ssh gnupg base-config build-essential +deborphan +debfoster +debsums +localepurge chdrvfont fbset fdutils @@ -19,6 +23,7 @@ wmakerconf libterm-readline-gnu-perl whiptail dialog +doc-base grub libsasl-modules-plain libsasl-digestmd5-plain @@ -37,3 +42,5 @@ sndconfig aptitude brltty popularity-contest +ntpdate +hdparm diff --git a/tasks/interesting-fromcd23 b/tasks/interesting-fromcd23 index ac9d6092..b77b4d3f 100644 --- a/tasks/interesting-fromcd23 +++ b/tasks/interesting-fromcd23 @@ -2,69 +2,86 @@ /* Generally useful/interesting (and mostly small) packages that would've ended up on CD 2 or 3 if we hadn't prevented it. */ -deborphan -debfoster -debsums -localepurge dpkg-repack grep-dctrl hddtemp -hdparm irda-tools hwtools acpid noflushd gpm -diald anacron +mc iproute host bzip2 +unzip +lockfile-progs alien +dict +screen zsh +vim joe -ntpdate -ghostview +xpdf-reader +gv gnucash wdm +gdm +kdm pdmenu slay vlock xosview -doc-base cvs +wget masqmail +fetchmailconf +ntp-simple elinks +w3m +konqueror mtr netcat +rsync licq -licq-plugin-qt +centericq pstotext word2x -mswordview +wv a2ps xkeycaps -xcolorsel -mkisofs -cd-discid -cdrdao -bplay +gimp1.2 +cupsys +sane +xsane +xscreensaver xli xmix +bplay splay xmp ucbmpeg-play mikmod +playmidi smpeg-gtv mp3blaster id3 +xmms +cd-discid +cdrdao +xcolorsel +xtoolwait +mkisofs +gphoto2 +octave csh +ee kernel-source-2.4.21 kernel-source-2.2.25 pcmcia-source +mysql-client dosemu -libghttp1 -g++ g77 ddd ccmalloc diff --git a/tasks/interesting-redhat b/tasks/interesting-redhat deleted file mode 100644 index 1d762bd9..00000000 --- a/tasks/interesting-redhat +++ /dev/null @@ -1,23 +0,0 @@ - -/* A list of packages on the first (er, only) official Red Hat CD that - wouldn't have gotten on our first CD without a bit of help. - People who grab the first Debian CD at a tradeshow and try to mimic - their RH install will find this useful. - Last synced with the RH CD in April 2001, possibly obsolete! - */ - -dhcpcd -ee -fetchmailconf -fvwm95 -fvwm95-icons -gphoto2 -octave -playmidi -postgresql -raidtools -sane -xbill -xsane -xtoolwait -