rev 15409 - trunk/packages/kdebase-workspace/debian

[Martin Alfke]

Author: mea-guest
Date: 2009-07-30 09:56:15 +0000 (Thu, 30 Jul 2009)
New Revision: 15409

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
Add sanity checks to kdm.init for availability of desktop-base 
file and path for theme and wallpaper.



Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-07-29 20:39:35 UTC (rev 15408)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-07-30 09:56:15 UTC (rev 15409)
@@ -5,6 +5,11 @@
   * Add libgps-dev build dependency.
   * Update installed files.
 
+  +++ Changes by Martin Alfke
+
+  * Add sanity checks to kdm.init file for availability of 
+    desktop-base files and paths. (Closes: #523109)
+
  -- Fathi Boudra <fabo at debian.org>  Wed, 22 Jul 2009 19:26:52 +0200
 
 kdebase-workspace (4:4.2.96-1) experimental; urgency=low

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2009-07-29 20:39:35 UTC (rev 15408)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2009-07-30 09:56:15 UTC (rev 15409)
@@ -74,8 +74,8 @@
 [ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
 [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
 [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
-[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
-[ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
+[ -n "$THEME" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
+[ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
 
 fi
 #usetheme is now on "by default" so we need to be sure that there is something ...