[SCM] live-build branch, debian, updated. debian/3.0_a23-1-7-g41d0208

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 3a44d9acbd0945018138ebb3548054985ee15e22
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 8 18:41:54 2011 +0200

    Correct gdm/gdm3 handling, prefere gdm for squeeze as before and use gdm3 for everything else.

diff --git a/package-lists/lxde b/package-lists/lxde
index e7c869f..dc20b99 100644
--- a/package-lists/lxde
+++ b/package-lists/lxde
@@ -3,6 +3,11 @@
 #include <standard-x11>
 
 lxde
+#if DISTRIBUTION squeeze
+gdm
+#endif
+#nif DISTRIBUTION squeeze
 gdm3
+#endif
 network-manager-gnome
 desktop-base
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 373ba18..eed0294 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -39,8 +39,9 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze|wheezy|sid)
-		if echo "${LB_TASKS}" | grep -qs xfce
+	squeeze)
+		if echo "${LB_TASKS}" | grep -qs lxde ||
+			echo "${LB_TASKS}" | grep -qs xfce
 		then
 			GDM="gdm"
 		else
@@ -49,7 +50,7 @@ case "${LB_PARENT_DISTRIBUTION}" in
 		;;
 
 	*)
-		GDM="gdm"
+		GDM="gdm3"
 		;;
 esac
 

-- 
live-build