[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-3-11-gf1ece5c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2e0031c21d5f351116cbc45b1903c2f8cf444a9a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Oct 17 19:00:04 2010 +0300

    Fix kdm.postinst not to fail if default display manager cannot be found on the system.
    
    After all, this behaviour appears to be an intention of the original code as
    well. (Closes: #585981)
---
 debian/changelog    |    3 +++
 debian/kdm.postinst |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90b4077..c567d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ kdebase-workspace (4:4.4.5-4~pre1) UNRELEASED; urgency=low
     (KDE bug #156475).
   * Add back support for changing RandR settings on KDE startup (patch
     29_backport_fix_krandr_support_in_startkde.diff). (Closes: #596473)
+  * Fix kdm.postinst not to fail due to -e mode even if default display manager
+    cannot be found on the system. After all, this behaviour appears to be an
+    intention of the original code as well. (Closes: #585981)
 
  -- Frederik Schwarzer <schwarzerf at gmail.com>  Sun, 26 Sep 2010 16:17:42 +0200
 
diff --git a/debian/kdm.postinst b/debian/kdm.postinst
index 1756869..bc1c02a 100644
--- a/debian/kdm.postinst
+++ b/debian/kdm.postinst
@@ -22,7 +22,7 @@ if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
       # if we were unable to determine the name of the selected daemon (for
       # instance, if the selected default display manager doesn't provide a
       # daemon_name question), guess
-      DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+      DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null || true)
       if [ ! -n "$DAEMON_NAME" ]; then
         echo .
         # FIXME - redo this part uses shell-lib.sh from xfree86

-- 
KDE Base Workspace module packaging