[SCM] live-config branch, debian-next, updated. debian/3.0_a13-1-1-g1c7d3c9
Daniel Baumann
daniel at debian.org
Fri Dec 3 23:11:22 UTC 2010
The following commit has been merged in the debian-next branch:
commit 1c7d3c9b56d58954bb4188d0cd140d44238dbfb8
Author: Nick Niktaris <niktaris at knoppel.org>
Date: Sat Dec 4 00:09:08 2010 +0100
Also depend on xdg-user-dirs in KDE4 specifics of debian-installer-launcher script.
diff --git a/scripts/config/108-debian-installer-launcher b/scripts/config/108-debian-installer-launcher
index a31112c..fa767ff 100755
--- a/scripts/config/108-debian-installer-launcher
+++ b/scripts/config/108-debian-installer-launcher
@@ -26,7 +26,8 @@ Configure_debian_installer_launcher ()
{
# 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 ]
+ if [ -d /usr/share/kde4/apps/kio_desktop/DesktopLinks ] && \
+ [ -e /var/lib/dpkg/info/xdg-user-dirs.list ]
then
install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /usr/share/kde4/apps/kio_desktop/DesktopLinks/debian-installer-launcher.desktop
else
--
live-config
More information about the debian-live-changes
mailing list