[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-3-32-gaa92f55

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit aa92f556e7605e0d5c6e1d9860fcf2a730faa6fb
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Aug 30 14:00:30 2010 +0300

    Fix the kdm init script to use any overrides set in /etc/default/kdm.d/.
    
    Because default_blue.jpg is no longer the default wallpaper, checking
    for it before using the overrides effectively made the overrides be ignored.
    This new approach allows the overrides to be used without checking if the
    default wallpaper is set in backgroundrc and only check it for overriding the
    wallpaper itself, i.e. if the default wallpaper is set in backgroundrc, use
    the overriden wallpaper (if any), otherwise use whatever is set.
---
 debian/changelog |    1 +
 debian/kdm.init  |   29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15a7258..6afc359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ kdebase-workspace (4:4.5.0+svn1166505-0r1) UNRELEASED; urgency=low
     As a consequence, add dependency on adduser on the kdm package.
   * Add dependency to iso-codes in kdebase-workspace-bin, since it is
     a runtime dependency for kcm_keyboard.
+  * Fix the kdm init script to use any overrides set in /etc/default/kdm.d/.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/kdm.init b/debian/kdm.init
index a3ed07b..e64c73d 100644
--- a/debian/kdm.init
+++ b/debian/kdm.init
@@ -64,20 +64,21 @@ setup_config () {
     # we generate kdm configuration files
     genkdmconf --in $KDMCFGDIR 1> /dev/null
 
-    if grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}; then
-      # we source overrides. run-parts sorts the list in a predictable order
-      if [ -d "$KDMOVERRIDEDIR" ]; then
-        for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
-          . "$part"
-        done
-      fi
+    # we source overrides. run-parts sorts the list in a predictable order
+    if [ -d "$KDMOVERRIDEDIR" ]; then
+      for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
+        . "$part"
+      done
+    fi
+
+    # we update kdm configuration files (only overridden values)
+    [ -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" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
+    [ -n "$LANGUAGE" ] && sed -i "s|^#\?Language=.*|Language=$LANGUAGE|" $KDMCFG
 
-      # we update kdm configuration files (only overridden values)
-      [ -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" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
-      [ -n "$LANGUAGE" ] && sed -i "s|^#\?Language=.*|Language=$LANGUAGE|" $KDMCFG
+    if grep -q "^[[:space:]]*Wallpaper=stripes.png" ${BACKGROUNDRC}; then
       [ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
     fi
 

-- 
KDE Base Workspace module packaging