From 4e34e5ffb88c494d1aec595ab1359b2c892d3729 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Sun, 23 Jan 2005 01:19:07 +0000
Subject: [PATCH]     - Update task files for tasksel 2.22

---
 debian/changelog           |   1 +
 tasks/task-essential-sarge |  23 ++--
 tasks/task-full-sarge      | 222 ++++++++++++++++++++-----------------
 3 files changed, 130 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a61c1d8..c9088453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
     - Update task lists to reflect tasksel changes.
     - Exclude new kernels from CD1.
     - Switch mips daily builds to new builds by ths.
+    - Update task files for tasksel 2.22.
   * Steve McIntyre
     - Substantially updated update-cd:
        - Cope with Woody r3 updates taking more than 1 CD per
diff --git a/tasks/task-essential-sarge b/tasks/task-essential-sarge
index 9e69d5ad..0cdc1179 100644
--- a/tasks/task-essential-sarge
+++ b/tasks/task-essential-sarge
@@ -13,15 +13,21 @@ grep-dctrl -s Key -n -e '.*' /usr/share/tasksel/debian-tasks.desc | sed -e 's? *
 
 apache2-mpm-prefork
 bind9
-chinput
 console-cyrillic
-cpanel
 cupsys
 cupsys-bsd
 cupsys-client
 exim4
 gnome-desktop-environment
 jfbterm
+kde-core
+kdeadmin
+kdeartwork
+kdegraphics
+kdemultimedia
+kdenetwork
+kdepim
+kdeutils
 language-env
 locales
 manpages-de
@@ -34,22 +40,11 @@ manpages-pl
 manpages-pt
 manpages-ru
 manpages-tr
-manpages-zh
 nfs-kernel-server
 postgresql
-rxvt-ml
 samba
+t1-cyrillic
 x-window-system-core
-xcin
 xfonts-thai
 xiterm+thai
 zhcon
-t1-cyrillic
-kde-core
-kdeadmin
-kdeartwork
-kdegraphics
-kdemultimedia
-kdenetwork
-kdeutils
-kdepim
diff --git a/tasks/task-full-sarge b/tasks/task-full-sarge
index 9a6f3522..771855f3 100644
--- a/tasks/task-full-sarge
+++ b/tasks/task-full-sarge
@@ -17,25 +17,22 @@ rm dumpavail
  *
  */
 
+bg5ps
+chinput
+cpanel
 doc-linux-ja-html
+fcitx
 fortune-mod
 gdm
+gimp
 gimp-help-sv
 gnome
-xscreensaver
 gnome-desktop-environment
 hspell-gui
 imhangul
 imhangul-status-applet
-kde-core
-kdeadmin
-kdeartwork
-kdegraphics
-kdemultimedia
-kdenetwork
-kdeutils
-kdepim
 kde
+kde-core
 kde-i18n-ca
 kde-i18n-da
 kde-i18n-de
@@ -45,7 +42,6 @@ kde-i18n-fr
 kde-i18n-he
 kde-i18n-it
 kde-i18n-ja
-kde-i18n-lt
 kde-i18n-nb
 kde-i18n-nn
 kde-i18n-pl
@@ -56,6 +52,12 @@ kde-i18n-tr
 kde-i18n-uk
 kde-i18n-zhcn
 kde-i18n-zhtw
+kdeadmin
+kdegraphics
+kdemultimedia
+kdenetwork
+kdepim
+kdeutils
 kinput2-canna-wnn
 koffice-i18n-ca
 koffice-i18n-da
@@ -69,32 +71,21 @@ menu
 mlterm
 mozilla-browser
 mozilla-firefox-locale-uk
-mozilla-locale-auto
 mozilla-locale-ca
 mozilla-locale-da
 mozilla-locale-de-at
 mozilla-locale-el
 mozilla-locale-it
 mozilla-locale-ja
+mozilla-locale-ko
 mozilla-locale-ptbr
 mozilla-psm
 mozilla-thunderbird-locale-uk
 myspell-en-gb
 myspell-en-us
+myspell-uk
 nabi
-openoffice.org
 openoffice.org-bin
-openoffice.org-help-de
-openoffice.org-help-el
-openoffice.org-help-en
-openoffice.org-help-es
-openoffice.org-help-fr
-openoffice.org-help-it
-openoffice.org-help-ja
-openoffice.org-help-ko
-openoffice.org-help-sv
-openoffice.org-help-zh-cn
-openoffice.org-help-zh-tw
 openoffice.org-l10n-ca
 openoffice.org-l10n-da
 openoffice.org-l10n-de
@@ -115,32 +106,52 @@ openoffice.org-l10n-th
 openoffice.org-l10n-tr
 openoffice.org-l10n-zh-cn
 openoffice.org-l10n-zh-tw
+pydict
+rxvt-ml
+rxvt-unicode-ml
+scim-chinese
+scim-tables-zh
+stardic
+t1-cyrillic
+t1-teams
+ttf-arhangai
+ttf-arphic-bkai00mp
+ttf-arphic-bsmi00lp
+ttf-arphic-gbsn00lp
+ttf-arphic-gkai00mp
 ttf-baekmuk
 ttf-freefont
 ttf-kochi-gothic
 ttf-kochi-mincho
 ttf-thryomanes
 ttf-unfonts
+unifont
+x-ttcidfont-conf
 x-window-system-core
+xcin
 xfonts-a12k12
 xfonts-ayu
 xfonts-baekmuk
 xfonts-biznet-iso-8859-2-100dpi
 xfonts-biznet-iso-8859-2-75dpi
 xfonts-biznet-iso-8859-2-base
+xfonts-bolkhov-75dpi
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-bolkhov-koi8r-75dpi
 xfonts-bolkhov-koi8r-misc
 xfonts-bolkhov-koi8u-75dpi
 xfonts-bolkhov-koi8u-misc
+xfonts-bolkhov-misc
+xfonts-cronyx-100dpi
 xfonts-cronyx-cp1251-100dpi
 xfonts-cronyx-isocyr-100dpi
 xfonts-cronyx-isocyr-75dpi
 xfonts-cronyx-isocyr-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-cronyx-koi8u-100dpi
-xfonts-cyrillic
+xfonts-intl-chinese
+xfonts-intl-chinese-big
 xfonts-intl-european
 xfonts-intl-japanese
 xfonts-intl-japanese-big
@@ -153,13 +164,15 @@ xfonts-shinonome
 xfonts-terminus
 xmanpages-ja
 xprt-xprintorg
+xscreensaver
 xxkb
-analog
+kdeartwork
 apache2-doc
 apache2-mpm-prefork
 libapache2-mod-perl2
 libapache2-mod-php4
 libapache2-mod-python
+analog
 exim4
 exim4-config
 exim4-daemon-light
@@ -170,19 +183,14 @@ procmail
 qpopper
 spamassassin
 uw-imapd
-cupsys
-cupsys-bsd
-cupsys-client
 cupsys-driver-gimpprint
 foomatic-db-engine
 foomatic-db-hpijs
+cupsys
+cupsys-bsd
+cupsys-client
 foomatic-filters-ppds
 foomatic-gui
-samba
-samba-doc
-smbclient
-smbfs
-swat
 pgaccess
 postgresql
 postgresql-client
@@ -215,122 +223,148 @@ aspell-ca
 icatalan
 kde-i18n-ca
 koffice-i18n-ca
-language-env
 mozilla-locale-ca
-mozilla-xft
 myspell-ca
 openoffice.org-l10n-ca
 util-linux-locales
 wcatalan
+language-env
 kde-i18n-ca
 koffice-i18n-ca
 mozilla-locale-ca
 openoffice.org-l10n-ca
 bg5ps
-cce
-chdrv
 chinput
 cpanel
 debian-zh-faq-s
+fcitx
 fortune-zh
 jfbterm
 kde-i18n-zhcn
-kon2
-language-env
-manpages-zh
-openoffice.org-help-zh-cn
+mlterm
 openoffice.org-l10n-zh-cn
-psfontmgr
-pydict
 rxvt-ml
+rxvt-unicode-ml
+scim-chinese
+scim-tables-zh
 stardic
-tfm-arphic-gbsn00lp
-tfm-arphic-gkai00mp
 ttf-arphic-gbsn00lp
 ttf-arphic-gkai00mp
 unifont
 x-ttcidfont-conf
-xcin
 xfonts-intl-chinese
 xfonts-intl-chinese-big
-yh
-yiyantang
 zh-autoconvert
 zhcon
-kde-i18n-zhcn
-openoffice.org-help-zh-cn
-openoffice.org-l10n-zh-cn
+language-env
+bg5ps
+chinput
+cpanel
+fcitx
+kde-i18n-zhcn
+mlterm
+openoffice.org-l10n-zh-cn
+rxvt-ml
+rxvt-unicode-ml
+scim-chinese
+scim-tables-zh
+stardic
+ttf-arphic-gbsn00lp
+ttf-arphic-gkai00mp
+unifont
+x-ttcidfont-conf
+xfonts-intl-chinese
+xfonts-intl-chinese-big
 bg5ps
-chdrv
 chinput
 cpanel
 debian-zh-faq-t
 fortune-zh
+jfbterm
 kde-i18n-zhtw
-language-env
-manpages-zh
-openoffice.org-help-zh-tw
+mlterm
 openoffice.org-l10n-zh-tw
-psfontmgr
 pydict
 rxvt-ml
-stardic
-tfm-arphic-bkai00mp
-tfm-arphic-bsmi00lp
+rxvt-unicode-ml
+scim-tables-zh
 ttf-arphic-bkai00mp
 ttf-arphic-bsmi00lp
-ttfprint
 unifont
 x-ttcidfont-conf
 xcin
 xfonts-intl-chinese
-yh
-yiyantang
 zh-autoconvert
 zhcon
+language-env
+bg5ps
+chinput
+cpanel
 kde-i18n-zhtw
-openoffice.org-help-zh-tw
+mlterm
 openoffice.org-l10n-zh-tw
+pydict
+rxvt-ml
+rxvt-unicode-ml
+scim-tables-zh
+ttf-arphic-bkai00mp
+ttf-arphic-bsmi00lp
+unifont
+x-ttcidfont-conf
+xcin
+xfonts-intl-chinese
 console-cyrillic
 konwert
-language-env
+t1-cyrillic
+t1-teams
+ttf-arhangai
+ttf-thryomanes
+xfonts-bolkhov-75dpi
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-bolkhov-koi8r-75dpi
 xfonts-bolkhov-koi8r-misc
 xfonts-bolkhov-koi8u-75dpi
 xfonts-bolkhov-koi8u-misc
+xfonts-bolkhov-misc
+xfonts-cronyx-100dpi
 xfonts-cronyx-cp1251-100dpi
 xfonts-cronyx-isocyr-100dpi
 xfonts-cronyx-isocyr-75dpi
 xfonts-cronyx-isocyr-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-cronyx-koi8u-100dpi
-xfonts-cyrillic
 xxkb
+language-env
+t1-cyrillic
+t1-teams
+ttf-arhangai
+ttf-thryomanes
+xfonts-bolkhov-75dpi
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-bolkhov-koi8r-75dpi
 xfonts-bolkhov-koi8r-misc
 xfonts-bolkhov-koi8u-75dpi
 xfonts-bolkhov-koi8u-misc
+xfonts-bolkhov-misc
+xfonts-cronyx-100dpi
 xfonts-cronyx-cp1251-100dpi
 xfonts-cronyx-isocyr-100dpi
 xfonts-cronyx-isocyr-75dpi
 xfonts-cronyx-isocyr-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-cronyx-koi8u-100dpi
-xfonts-cyrillic
 xxkb
 aspell-da
 idanish
 kde-i18n-da
 koffice-i18n-da
-language-env
 mozilla-locale-da
 openoffice.org-l10n-da
 util-linux-locales
 wdanish
+language-env
 kde-i18n-da
 koffice-i18n-da
 mozilla-locale-da
@@ -339,48 +373,42 @@ doc-debian-fr
 doc-linux-fr-text
 ifrench-gut
 kde-i18n-fr
-language-env
 manpages-fr
 myspell-fr-gut
-openoffice.org-help-fr
 openoffice.org-l10n-fr
 wfrench
 xfonts-intl-european
+language-env
 kde-i18n-fr
-openoffice.org-help-fr
 openoffice.org-l10n-fr
 xfonts-intl-european
 ding
 doc-linux-de
 ingerman
 kde-i18n-de
-language-env
 manpages-de
 mozilla-locale-de-at
 myspell-de-at
 myspell-de-ch
 myspell-de-de
-openoffice.org-help-de
 openoffice.org-l10n-de
 trans-de-en
 wngerman
+language-env
 kde-i18n-de
 mozilla-locale-de-at
-openoffice.org-help-de
 openoffice.org-l10n-de
 kde-i18n-el
 koffice-i18n-el
-language-env
 mozilla-locale-el
-openoffice.org-help-el
 openoffice.org-l10n-el
 ttf-freefont
 ttf-thryomanes
 xfonts-intl-european
+language-env
 kde-i18n-el
 koffice-i18n-el
 mozilla-locale-el
-openoffice.org-help-el
 openoffice.org-l10n-el
 ttf-freefont
 ttf-thryomanes
@@ -406,19 +434,17 @@ fortunes-it
 iitalian
 kde-i18n-it
 koffice-i18n-it
-language-env
 maint-guide-it
 manpages-it
 mozilla-locale-it
 myspell-it
-openoffice.org-help-it
 openoffice.org-l10n-it
 witalian
 xfonts-intl-european
+language-env
 kde-i18n-it
 koffice-i18n-it
 mozilla-locale-it
-openoffice.org-help-it
 openoffice.org-l10n-it
 xfonts-intl-european
 canna
@@ -432,14 +458,12 @@ jfbterm
 kde-i18n-ja
 kinput2-canna-wnn
 kterm
-language-env
 lv
 manpages-ja
 manpages-ja-dev
 mlterm
 mozilla-locale-ja
 nkf
-openoffice.org-help-ja
 openoffice.org-l10n-ja
 ttf-kochi-gothic
 ttf-kochi-mincho
@@ -454,13 +478,13 @@ xfonts-mona
 xfonts-mplus
 xfonts-shinonome
 xmanpages-ja
+language-env
 doc-linux-ja-html
 kde-i18n-ja
 kinput2-canna-wnn
 kterm
 mlterm
 mozilla-locale-ja
-openoffice.org-help-ja
 openoffice.org-l10n-ja
 ttf-kochi-gothic
 ttf-kochi-mincho
@@ -480,34 +504,29 @@ doc-linux-text-ko
 imhangul
 imhangul-status-applet
 jfbterm
-language-env
 manpages-ko
-mozilla-locale-auto
+mozilla-locale-ko
 nabi
-openoffice.org-help-ko
 openoffice.org-l10n-ko
 ttf-baekmuk
 ttf-unfonts
 xfonts-baekmuk
+language-env
 imhangul
 imhangul-status-applet
-mozilla-locale-auto
+mozilla-locale-ko
 nabi
-openoffice.org-help-ko
 openoffice.org-l10n-ko
 ttf-baekmuk
 ttf-unfonts
 xfonts-baekmuk
 ilithuanian
-kde-i18n-lt
-language-env
 myspell-lt
-kde-i18n-lt
+language-env
 aspell-no
 inorwegian
 kde-i18n-nb
 kde-i18n-nn
-language-env
 locales
 myspell-nb
 myspell-nn
@@ -515,6 +534,7 @@ openoffice.org-l10n-nb
 openoffice.org-l10n-nn
 util-linux-locales
 wnorwegian
+language-env
 kde-i18n-nb
 kde-i18n-nn
 openoffice.org-l10n-nb
@@ -525,7 +545,6 @@ fonty
 ipolish
 kde-i18n-pl
 konwert
-language-env
 manpages-pl
 manpages-pl-dev
 openoffice.org-l10n-pl
@@ -533,6 +552,7 @@ wpolish
 xfonts-biznet-iso-8859-2-100dpi
 xfonts-biznet-iso-8859-2-75dpi
 xfonts-biznet-iso-8859-2-base
+language-env
 kde-i18n-pl
 openoffice.org-l10n-pl
 xfonts-biznet-iso-8859-2-100dpi
@@ -542,7 +562,6 @@ console-cyrillic
 irussian
 kde-i18n-ru
 konwert
-language-env
 manpages-ru
 mueller7-dict
 myspell-ru
@@ -552,6 +571,7 @@ xfonts-bolkhov-koi8r-75dpi
 xfonts-bolkhov-koi8r-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-intl-european
+language-env
 kde-i18n-ru
 openoffice.org-l10n-ru
 xfonts-bolkhov-koi8r-75dpi
@@ -559,7 +579,6 @@ xfonts-bolkhov-koi8r-misc
 xfonts-cronyx-koi8r-100dpi
 xfonts-intl-european
 aspell-es
-debian-guide-es
 debian-reference-es
 debrecipes-es
 doc-debian-es
@@ -567,16 +586,14 @@ doc-es-misc
 doc-linux-es
 ispanish
 kde-i18n-es
-language-env
 linux-tutorial-es
 manpages-es
 myspell-es
-openoffice.org-help-es
 openoffice.org-l10n-es
 util-linux-locales
 wspanish
+language-env
 kde-i18n-es
-openoffice.org-help-es
 openoffice.org-l10n-es
 aspell-sv
 doc-linux-sv-html
@@ -586,50 +603,51 @@ kde-i18n-sv
 koffice-i18n-sv
 locales
 myspell-sv-se
-openoffice.org-help-sv
 openoffice.org-l10n-sv
 util-linux-locales
 wswedish
 gimp-help-sv
 kde-i18n-sv
 koffice-i18n-sv
-openoffice.org-help-sv
 openoffice.org-l10n-sv
 cttex
-language-env
 nonlock
 openoffice.org-l10n-th
 ttmkfdir
 xfonts-thai
 xiterm+thai
+language-env
 openoffice.org-l10n-th
 console-terminus
 kde-i18n-tr
 koffice-i18n-tr
-language-env
 locales
 manpages-tr
 openoffice.org-l10n-tr
 util-linux-locales
 xfonts-terminus
+language-env
 kde-i18n-tr
 koffice-i18n-tr
 openoffice.org-l10n-tr
 xfonts-terminus
 aspell-ukr
 console-cyrillic
+iukrainian
 kde-i18n-uk
 konwert
-language-env
 mozilla-firefox-locale-uk
 mozilla-thunderbird-locale-uk
+myspell-uk
 xfonts-bolkhov-koi8u-75dpi
 xfonts-bolkhov-koi8u-misc
 xfonts-cronyx-koi8u-100dpi
 xfonts-intl-european
+language-env
 kde-i18n-uk
 mozilla-firefox-locale-uk
 mozilla-thunderbird-locale-uk
+myspell-uk
 xfonts-bolkhov-koi8u-75dpi
 xfonts-bolkhov-koi8u-misc
 xfonts-cronyx-koi8u-100dpi