* Update task.list adding more language tasks.

* Update task-essential-etch build recipe to exclude the kde-desktop
  task since it won't fit on the CD.
* Move kde-desktop to end of task.list for same reason.
* Update task-full-etch to current tasksel.

debian/changelog

@@ -41,8 +41,13 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
     off (due to size issues). Fix this by not failing if the el-torito images
     arn't there.
   * d-i doesn't include bast images anymore, drop from boot-arm.
+  * Update task.list adding more language tasks.
+  * Update task-essential-etch build recipe to exclude the kde-desktop
+    task since it won't fit on the CD.
+  * Move kde-desktop to end of task.list for same reason.
+  * Update task-full-etch to current tasksel.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 24 May 2006 14:03:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon,  5 Jun 2006 15:09:01 -0400
 
 debian-cd (2.2.24) unstable; urgency=low
 

tasks/task-essential-etch

@@ -4,8 +4,10 @@
  
  
  for i in $(cat task.list); do
-  grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc |
+   if [ "$i" != kde-desktop ]; then
-    grep-dctrl -s Key -n -e '.*'
+     grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc |
+     grep-dctrl -s Key -n -e '.*'
+   fi
  done | sed -e 's? *??' | grep -v ^$ >> ./task-essential-etch
   
  * Last updated: $Date$
@@ -64,3 +66,7 @@ language-env
 language-env
 language-env
 locales
+language-env
+language-env
+language-env
+language-env

tasks/task-full-etch

@@ -17,23 +17,44 @@ done >> ./task-full-etch
  */
 
 
+alsa-base
+alsa-utils
+firefox
 gimp
+mdetect
 menu
-mozilla-firefox
-mozilla-psm
 myspell-en-gb
 myspell-en-us
-openoffice.org-help-en
+openoffice.org
-openoffice.org-kde
+openoffice.org-help-en-gb
-synaptic
+openoffice.org-help-en-us
+openoffice.org-l10n-en-gb
+openoffice.org-l10n-en-us
+read-edid
 twm
 x-window-system-core
 xterm
-fortune-mod
+alacarte
-gnome
+deskbar-applet
+evolution-exchange
+evolution-plugins
+evolution-webcal
+gaim
+gdebi
+gnome-btdownload
+gnome-cups-manager
 gnome-desktop-environment
+gnome-screensaver
+gnome-themes-extras
+gparted
+grdesktop
 libtheora0
-xscreensaver
+liferea
+openoffice.org-evolution
+openoffice.org-gnome
+rhythmbox
+synaptic
+update-notifier
 analog
 apache2-doc
 apache2-mpm-prefork
@@ -44,6 +65,8 @@ acpi
 acpid
 anacron
 apmd
+cpufrequtils
+hibernate
 pcmcia-cs
 wireless-tools
 xfree86-driver-synaptics
@@ -55,6 +78,7 @@ mailx
 mutt
 procmail
 qpopper
+sa-exim
 spamassassin
 uw-imapd
 cupsys
@@ -92,6 +116,7 @@ manpages-pt
 myspell-pt-br
 kde-i18n-ptbr
 mozilla-locale-ptbr
+openoffice.org-help-pt-br
 openoffice.org-l10n-pt-br
 aspell-ca
 icatalan
@@ -113,6 +138,7 @@ ttf-arphic-gbsn00lp
 ttf-arphic-gkai00mp
 xfonts-intl-chinese-big
 debian-zh-faq-t
+kde-i18n-zhtw
 m17n-env
 openoffice.org-help-zh-tw
 openoffice.org-l10n-zh-tw
@@ -121,6 +147,8 @@ scim-chewing
 ttf-arphic-bkai00mp
 ttf-arphic-bsmi00lp
 xcin
+openoffice.org-l10n-be-by
+openoffice.org-l10n-sr-cs
 t1-cyrillic
 t1-teams
 ttf-arhangai
@@ -140,6 +168,7 @@ wdanish
 kde-i18n-da
 koffice-i18n-da
 mozilla-locale-da
+openoffice.org-help-da
 openoffice.org-l10n-da
 doc-debian-fr
 doc-linux-fr-text
@@ -163,13 +192,14 @@ kde-i18n-de
 mozilla-locale-de-at
 openoffice.org-help-de
 openoffice.org-l10n-de
+openoffice.org-thesaurus-de
+openoffice.org-thesaurus-de-ch
 kde-i18n-el
 koffice-i18n-el
 mozilla-firefox-locale-el
 mozilla-locale-el
 mozilla-thunderbird-locale-el
 myspell-el-gr
-openoffice.org-help-el
 openoffice.org-l10n-el
 ttf-mgopen
 aspell-he
@@ -184,7 +214,7 @@ hspell-gui
 kde-i18n-he
 koffice-i18n-he
 mozilla-firefox-locale-he-il
-mozilla-firefox-theme-rtlclassic
+openoffice.org-l10n-he
 apt-howto-it
 aspell-it
 debian-reference-it
@@ -243,6 +273,9 @@ xfonts-baekmuk
 aspell-lt
 ilithuanian
 myspell-lt
+kde-i18n-lt
+openoffice.org-hyphenation-lt
+openoffice.org-l10n-lt
 aspell-no
 inorwegian
 myspell-nb
@@ -266,7 +299,6 @@ mueller7-dict
 myspell-ru
 re
 kde-i18n-ru
-openoffice.org-l10n-ru
 aspell-es
 debian-reference-es
 doc-debian-es
@@ -279,7 +311,6 @@ kde-i18n-es
 openoffice.org-help-es
 openoffice.org-l10n-es
 aspell-sv
-doc-linux-sv-html
 iswedish
 myspell-sv-se
 wswedish
@@ -292,27 +323,34 @@ cttex
 ttmkfdir
 xfonts-thai
 xiterm+thai
+openoffice.org-l10n-th
 manpages-tr
 kde-i18n-tr
 koffice-i18n-tr
 openoffice.org-l10n-tr
-aspell-ukr
+aspell-uk
 iukrainian
 kde-i18n-uk
 mozilla-firefox-locale-uk
 mozilla-thunderbird-locale-uk
 myspell-uk
+itools
 ttf-arabeyes
 xfonts-intl-arabic
 kde-i18n-ar
+openoffice.org-l10n-ar
+ttf-kacst
 aspell-bg
 ibulgarian
 wbulgarian
 kde-i18n-bg
 myspell-bg
+openoffice.org-l10n-bg
+aspell-cs
 iczech
 kde-i18n-cs
 mozilla-firefox-locale-cs-cz
+openoffice.org-help-cs
 openoffice.org-l10n-cs
 idutch
 wdutch
@@ -320,10 +358,49 @@ aspell-nl
 kde-i18n-nl
 mozilla-firefox-locale-nl-nl
 myspell-nl
+openoffice.org-help-nl
 openoffice.org-l10n-nl
 kde-i18n-ro
 mozilla-firefox-locale-ro-ro
-ttf-dejavu
 aspell-sk
 kde-i18n-sk
 openoffice.org-l10n-sk
+aspell-bn
+ttf-bengali-fonts
+aspell-hi
+ttf-devanagari-fonts
+kde-i18n-hi
+openoffice.org-l10n-hi-in
+ihungarian
+manpages-hu
+aspell-hu
+gsfonts-x11
+kde-i18n-hu
+mozilla-firefox-locale-hu-hu
+myspell-hu
+openoffice.org-help-hu
+openoffice.org-hyphenation-hu
+openoffice.org-l10n-hu
+ttf-isabella
+ttf-junicode
+ttf-opensymbol
+xfonts-biznet-100dpi
+xfonts-biznet-base
+kde-i18n-fa
+koffice-i18n-fa
+aspell-pa
+ttf-punjabi-fonts
+kde-i18n-pa
+openoffice.org-l10n-pa-in
+kde
+kde-core
+kdeadmin
+kdeartwork
+kdegraphics
+kdemultimedia
+kdenetwork
+kdepim
+kdeutils
+kdm
+kpackage
+openoffice.org-kde

tasks/task.list

@@ -1,6 +1,5 @@
 desktop
 gnome-desktop
-kde-desktop
 web-server
 laptop
 mail-server
@@ -64,3 +63,14 @@ romanian
 romanian-desktop
 slovak
 slovak-desktop
+bengali
+bangali-desktop
+hindi
+hindi-desktop
+hungarian
+hungarian-desktop
+persian
+persian-desktop
+punjabi
+punjabi-desktop
+kde-desktop