From dc3927d14ca0dfbb8b0109d12ea213e50b84ecb6 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Fri, 5 Dec 2008 14:12:32 +0000
Subject: [PATCH] Add support for a separate 'GNOME desktop environment' CD

This new task is mostly added for completeness. Main difference with
the default task file is that no server tasks are included.
---
 debian/changelog            |  3 +++
 easy-build.sh               |  9 +++------
 tasks/lenny/Debian-gnome    | 19 +++++++++++++++++++
 tasks/lenny/task.list.gnome |  3 +++
 tools/boot/lenny/boot-x86   |  6 ++++++
 tools/boot/lenny/common.sh  |  4 ++--
 tools/update_tasks          |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 tasks/lenny/Debian-gnome
 create mode 100644 tasks/lenny/task.list.gnome

diff --git a/debian/changelog b/debian/changelog
index 6adc5631..ff76db92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,9 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
     tasksel (GNOME, KDE, LXDE and Xfce). On x86 it will also add an option in
     the isolinux menu (under Advanced options) to select which DE to install,
     but GNOME will remain default.
+  * Add support for a separate 'GNOME desktop environment' CD.
+    This new task is mostly added for completeness. Main difference with the
+    default task file is that no server tasks are included.
 
  -- Frans Pop <fjp@debian.org>  Fri, 05 Dec 2008 10:04:03 +0100
 
diff --git a/easy-build.sh b/easy-build.sh
index aaacb024..b5436a97 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -6,7 +6,7 @@ set -e
 ## See also CONF.sh for the meaning of variables used here.
 
 show_usage() {
-	echo "Usage: $(basename $0) [-d kde|lxde|xfce|light|all] BC|NETINST|CD|DVD [<ARCH> ...]"
+	echo "Usage: $(basename $0) [-d gnome|kde|lxde|xfce|light|all] BC|NETINST|CD|DVD [<ARCH> ...]"
 }
 
 
@@ -27,11 +27,8 @@ fi
 desktop=
 if [ "$1" = "-d" ]; then
 	case $2 in
-	    gnome)
-		# Ignore (gnome is default)
-		shift 2
-		;;
-	    kde|lxde|xfce|light|all)
+	    # Note: "gnome" is the special gnome task, not the generic task
+	    gnome|kde|lxde|xfce|light|all)
 		desktop=$2
 		shift 2
 		;;
diff --git a/tasks/lenny/Debian-gnome b/tasks/lenny/Debian-gnome
new file mode 100644
index 00000000..4e6658ed
--- /dev/null
+++ b/tasks/lenny/Debian-gnome
@@ -0,0 +1,19 @@
+/*
+ *
+ * This file will be used to build an official installation CD for Lenny
+ * that can be used to install the GNOME desktop environment and that does
+ * not include server tasks on CD1.
+ *
+ */
+
+/* Packages that should really be on CD1 */\
+#include <debian-installer+kernel>
+#include <forcd1>
+#include <task-essential-gnome>
+
+/* Other interesting packages */
+#include <task-full-gnome>
+#include <interesting-fromcd23>
+
+/* The rest ordered by popularity */
+#include <popularity-contest>
diff --git a/tasks/lenny/task.list.gnome b/tasks/lenny/task.list.gnome
new file mode 100644
index 00000000..11844ddc
--- /dev/null
+++ b/tasks/lenny/task.list.gnome
@@ -0,0 +1,3 @@
+gnome-desktop
+desktop
+laptop
diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index 57a6132e..a5379f13 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -141,6 +141,12 @@ extra_image () {
 # If multiple desktops are to be supported, set the default one
 ORIG_DESKTOP=
 case "$DESKTOP" in
+    gnome)
+	# gnome is default in tasksel 
+	DESKTOP=
+	KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
+		sed -r "s/desktop=[^ ]* ?//")"
+	;;
     all)
 	ORIG_DESKTOP=$DESKTOP
 	DESKTOP=
diff --git a/tools/boot/lenny/common.sh b/tools/boot/lenny/common.sh
index 850668c7..77358371 100644
--- a/tools/boot/lenny/common.sh
+++ b/tools/boot/lenny/common.sh
@@ -10,10 +10,10 @@ DI_DIR="$(echo "$DI_DIR" | sed -e "s|%ARCH%|$ARCH|g")"
 # desktops; make sure other arches get a working config
 if [ "$ARCH" != i386 ] && [ "$ARCH" != amd64 ]; then
     case $DESKTOP in
-        all)
+        all|gnome)
             DESKTOP=
             KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
-                sed -r "s/desktop=all ?//")"
+                sed -r "s/desktop=[^ ]* ?//")"
             ;;
         light)
             DESKTOP=xfce
diff --git a/tools/update_tasks b/tools/update_tasks
index aff537a2..086e3e94 100755
--- a/tools/update_tasks
+++ b/tools/update_tasks
@@ -165,7 +165,7 @@ dpkg -x $TASKSEL_DEB $TDIR/tasksel
 [ -e task.languages ] || exit 1
 grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
 
-for variant in "" kde lxde xfce light all; do
+for variant in "" gnome kde lxde xfce light all; do
     if [ ! -e task.list${variant:+.$variant} ]; then
         echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
 	continue