[SCM] live-helper branch, debian, updated. debian/2.0_a4-1-5-gf358b60

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit f358b604c670a0d53542f8a2aa339a630f108fd6
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jan 20 13:03:50 2010 +0100

    Adding special handling for kde-desktop hook in lh_chroot_hocks.

diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 04fe487..986aab5 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -42,6 +42,12 @@ HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' |
 
 for HOOK in ${HOOKS}
 do
+	# Special handling for kde
+	if [ "${HOOK}" = "kde-desktop" ] && [ -n "$(echo ${HOOKS} | grep gnome-desktop)" ]
+	then
+		continue
+	fi
+
 	if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
 	then
 		# Copying hook

-- 
live-helper