[SCM] live-config branch, debian-next, updated. debian/3.0_a12-1-4-gc42e6cd
Daniel Baumann
daniel at debian.org
Sat Nov 27 13:33:57 UTC 2010
The following commit has been merged in the debian-next branch:
commit c42e6cd2c366e312abca6d3fbc5c6552239a4488
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/108-debian-installer-launcher b/scripts/config/108-debian-installer-launcher
index 2894f5b..30291ee 100755
--- a/scripts/config/108-debian-installer-launcher
+++ b/scripts/config/108-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
More information about the debian-live-changes
mailing list