[SCM] live-build branch, debian-next, updated. debian/2.0_a25-1-4-gdd2c7af

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit dd2c7afa0f5590aa78c14073bfa3cda271da59c0
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 2 23:56:25 2010 +0200

    Updating gdm handling for lxde.

diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 1fd3aa8..4417e33 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -38,19 +38,24 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-# Handling default desktop configuration
-for TASK in ${LH_TASKS}
-do
-	case "${LH_DISTRIBUTION}" in
-		lenny)
+case "${LH_DISTRIBUTION}" in
+	squeeze|sid)
+		if echo "${LH_TASKS}" | grep -qs lxde
+		then
 			GDM="gdm"
-			;;
-
-		*)
+		else
 			GDM="gdm3"
-			;;
-	esac
+		fi
+		;;
+
+	*)
+		GDM="gdm"
+		;;
+esac
 
+# Handling default desktop configuration
+for TASK in ${LH_TASKS}
+do
 	case "${TASK}" in
 		gnome-desktop)
 			# gnome is the only desktop environment in this image

-- 
live-build