From f805d4de521f52bd88efdfe130ae3721ba02bac7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Wed, 14 Jul 2004 23:27:05 +0000
Subject: [PATCH]     - Update task-essential-sarge to tasksel 2.05. Fix the
 generator to work       with post-2002 tasksels.

---
 debian/changelog           |   2 +
 tasks/task-essential-sarge | 120 +++++--------------------------------
 2 files changed, 17 insertions(+), 105 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cca3d8e..d39d8029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
       debs as well as udebs used by d-i are included.
     - Exclude newer versions of i386 kernels to save space. Leave 2.6.x-386
       kernels on the CD.
+    - Update task-essential-sarge to tasksel 2.05. Fix the generator to work
+      with post-2002 tasksels.
   * 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/task-essential-sarge b/tasks/task-essential-sarge
index 2950e39e..0726f773 100644
--- a/tasks/task-essential-sarge
+++ b/tasks/task-essential-sarge
@@ -2,7 +2,7 @@
  *
  * Generated with: 
  
-grep-dctrl -s Essential -n -e '.*' /usr/share/tasksel/debian-tasks.desc | sed -e 's? *??' | grep -v ^$ | sort | uniq
+grep-dctrl -s Key -n -e '.*' /usr/share/tasksel/debian-tasks.desc | sed -e 's? *??' | grep -v ^$ | sort | uniq
 
  * If the list is too big for the first CD, then we'll have to sort it
  * better, but hopefully this will never be needed since the goal of that
@@ -11,132 +11,42 @@ grep-dctrl -s Essential -n -e '.*' /usr/share/tasksel/debian-tasks.desc | sed -e
  * Last updated: $Date$
  */
 
-ami
-apache
-apmd
-ark
+apache2-mpm-prefork
 bind9
-binutils
 canna
 chinput
 console-cyrillic
 cpanel
-cpp
-eog
-esound
-evolution 
-exim
-g++
-g77
-galeon
-gcc
-gconf
-gdb
-gedit
-gftp
-gimp
-gmc
-gnome
-gnome-admin
-gnome-applets
-gnome-audio
-gnome-bin
-gnome-control-center
-gnome-core
-gnome-help
-gnome-media
-gnome-panel
-gnome-session
-gnome-terminal
-gnome-utils
-hanterm
-imlib-base
-inn2
-isdnutils
+cupsys
+cupsys-bsd
+cupsys-client
+exim4
+gnome-desktop-environment
 jfbterm
-kab
-karm
-kate 
-kcalc
-kcharselect
-kcoloredit
-kcron
 kde
-kdebase 
-kdebase-audiolibs 
-kdebase-doc 
-kdebase-libs 
-kdelibs3
-kdepasswd
-kdewallpapers 
-kdf
-kdict
-kdm 
-kedit
-kfind
-kfract
-kghostview
-khexedit
-kiconedit
-kit
-kjots
-kmail
-knewsticker
-knode
-knotes
-koffice
-konqueror 
-konsole 
-korn
-kpackage
-kpaint
-kpm
-kruler
-kscreensaver 
-ksirc
-ksnapshot
-ksysv
 kterm
-ktimer
-kuser
-kview
 language-env
-libarts 
-libkmid 
-libkonq3 
 locales
-lpr
-make
 manpages-de
 manpages-es
 manpages-fr
+manpages-it
 manpages-ja
 manpages-ko
 manpages-pl
+manpages-pt
 manpages-ru
+manpages-tr
 manpages-zh
-nautilus
+nabi
 nfs-kernel-server
-pan
-pcmcia-cs
 postgresql
-ppp
-pppoe
-python
 rxvt-ml
 samba
-sawfish-gnome
-secpolicy
-strace
-tcl8.3-dev
-tetex-base
-tetex-bin
-tetex-extra
-tk8.3-dev
-user-es
-xchat-gnome
+ttf-unfonts
+x-window-system-core
 xcin
 xfonts-intl-japanese
-x-window-system
-x-window-system-core
+xfonts-thai
+xiterm+thai
 zhcon