[SCM] live-config branch, debian, updated. debian/2.0.13-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 7aee418e0778cc153844771d6a0f1280e8bf5767
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 27 14:33:32 2010 +0100

    Correct debian-installer-launcher script for KDE4, thanks to Nick Niktaris <niktaris at knoppel.org>.

diff --git a/scripts/config/109-debian-installer-launcher b/scripts/config/109-debian-installer-launcher
index 2894f5b..30291ee 100755
--- a/scripts/config/109-debian-installer-launcher
+++ b/scripts/config/109-debian-installer-launcher
@@ -24,8 +24,16 @@ Debian_installer_launcher ()
 
 Configure_debian_installer_launcher ()
 {
-	install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
-	chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
+	# KDE4 needs the desktop file somewhere else,
+	# otherwise no Home and Trash icons on the desktop.
+	if [ -d  /usr/share/kde4/apps/kio_desktop/DesktopLinks ]
+	then
+		install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /usr/share/kde4/apps/kio_desktop/DesktopLinks/
+		chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
+	else
+		install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
+		chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
+	fi
 
 	# Creating state file
 	touch /var/lib/live/config/debian-installer-launcher

-- 
live-config