* Add kpackage to kde-desktop.

* Move synaptic to gnome-desktop.
* Add kdm to kde-desktop. Note that gdm is pulled in via gnome-desktop only.

debian/changelog

@@ -40,8 +40,11 @@ tasksel (2.43) UNRELEASED; urgency=low
   * Support preseeding tasks to install using the task name, which is shorter
     and nicer for preseeding than the short description. So for example,
     you can boot with tasksel/first=kde-desktop ..
+  * Add kpackage to kde-desktop.
+  * Move synaptic to gnome-desktop.
+  * Add kdm to kde-desktop. Note that gdm is pulled in via gnome-desktop only.
 
- -- Christian Perrier <bubulle@debian.org>  Mon, 24 Apr 2006 14:17:15 +0200
+ -- Joey Hess <joeyh@debian.org>  Mon, 24 Apr 2006 13:56:58 -0400
 
 tasksel (2.42) unstable; urgency=low
 

tasks/desktop

@@ -24,9 +24,6 @@ Packages-list:
   openoffice.org-help-en-gb
   myspell-en-us
   myspell-en-gb
-# synaptic fits in better with gnome than kde, so if we got a good
-# qt-based package manager, this might be moved to gnome-desktop
-  synaptic
 # Since neither the gnome nor kde desktop tasks may be available, include
 # enough basic X stuff here for a minally useful desktop without them.
   twm

tasks/gnome-desktop

@@ -20,3 +20,5 @@ Packages-list:
   openoffice.org-gnome
 # enable debian menus
   menu-xdg
+# package management
+  synaptic

tasks/kde-desktop

@@ -17,9 +17,12 @@ Key:
   kdenetwork
   kdeutils
   kdepim
+  kdm
 Packages: task-fields
 Packages-list:
   kde
   openoffice.org-kde
 # enable debian menus
   menu-xdg
+# package management
+  kpackage

tasksel.pl

@@ -523,11 +523,11 @@ sub main {
 		else {
 			# If an enhancing task is already marked for
 			# install, probably by preseeding, mark the tasks
-			# it enhanes for install, but avoid pulling in
-			# other enahncers.
+			# it enhances for install.
 			push @enhanced_install, list_to_tasks($task->{enhances}, @tasks);
 		}
 	}
+
 	map { $_->{_install} = 1 } @enhanced_install;
 
 	# Add tasks to install and see if any selected task requires manual