[3/6] Add support for a separate LXDE desktop CD

[Frans Pop]

Fairly simple patch.

Note that we may not even use this for official CD builds if we prefer the 
light desktop CD, but it does no harm to support it.


    Add support for a separate LXDE desktop CD
    
    For now use A as identifier for TESTING_CD in contrib/testingcds;
    we should probably switch to a double digit scheme post lenny or
    even generally rationalize the use of TESTING_CD.

diff --git a/contrib/testingcds b/contrib/testingcds
index 7dc2b5c..b5a6404 100644
--- a/contrib/testingcds
+++ b/contrib/testingcds
@@ -64,10 +64,12 @@ case "$INSTALLER_CD" in
         export DISKTYPE=kde-CD;;
     5)
         export DISKTYPE=xfce-CD;;
+    A)
+        export DISKTYPE=lxde-CD;;
     9)
         export OUT_TYPE=bd
         export DISKTYPE=BD;;
-    *) export DISKTYPE=CD;;
+    *)  export DISKTYPE=CD;;
 esac
 
 if [ "$OUT_TYPE"x = ""x ] ; then
@@ -91,6 +93,8 @@ elif [ "$INSTALLER_CD" = "4" ]; then
     export OFFICIAL="Official KDE CD Snapshot"
 elif [ "$INSTALLER_CD" = "5" ]; then
     export OFFICIAL="Official Xfce CD Snapshot"
+elif [ "$INSTALLER_CD" = "A" ]; then
+    export OFFICIAL="Official LXDE CD Snapshot"
 elif [ "$INSTALLER_CD" = "6" ]; then
     export OFFICIAL="Official Multi-Arch DVD"
 elif [ "$INSTALLER_CD" = "7" ]; then
diff --git a/easy-build.sh b/easy-build.sh
index 101493b..75b2ce4 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|xfce] BC|NETINST|CD|DVD [<ARCH> ...]"
+	echo "Usage: $(basename $0) [-d kde|lxde|xfce] BC|NETINST|CD|DVD [<ARCH> ...]"
 }
 
 
@@ -31,7 +31,7 @@ if [ "$1" = "-d" ]; then
 		# Ignore (gnome is default)
 		shift 2
 		;;
-	    kde|xfce)
+	    kde|lxde|xfce)
 		desktop=$2
 		shift 2
 		;;
diff --git a/tasks/lenny/Debian-lxde b/tasks/lenny/Debian-lxde
new file mode 100644
index 0000000..1c85edf
--- /dev/null
+++ b/tasks/lenny/Debian-lxde
@@ -0,0 +1,18 @@
+/*
+ *
+ * This file will be used to build an official installation CD for Lenny
+ * that can be used to install the LXDE desktop environment.
+ *
+ */
+
+/* Packages that should really be on CD1 */\
+#include <debian-installer+kernel>
+#include <forcd1>
+#include <task-essential-lxde>
+
+/* Other interesting packages */
+#include <task-full-lxde>
+#include <interesting-fromcd23>
+
+/* The rest ordered by popularity */
+#include <popularity-contest>
diff --git a/tasks/lenny/task.list.lxde b/tasks/lenny/task.list.lxde
new file mode 100644
index 0000000..fcd46d5
--- /dev/null
+++ b/tasks/lenny/task.list.lxde
@@ -0,0 +1,3 @@
+lxde-desktop
+desktop
+laptop
diff --git a/tools/update_tasks b/tools/update_tasks
index 96896aa..06d9524 100755
--- a/tools/update_tasks
+++ b/tools/update_tasks
@@ -163,7 +163,7 @@ dpkg -x $TASKSEL_DEB $TDIR/tasksel
 [ -e task.languages ] || exit 1
 grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
 
-for variant in "" kde xfce; do
+for variant in "" kde lxde xfce; do
     if [ ! -e task.list${variant:+.$variant} ]; then
         echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
 	continue

signature.asc
Description: This is a digitally signed message part.