Merge lp:~robert-ancell/lightdm/handle-no-xrdb into lp:lightdm

[Robert Ancell]

Allow lightdm-session to run if xrdb, setxkbmap or xmodmap are not installed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1811
http://jenkins.qa.ubuntu.com/job/lightdm-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-armhf-ci/8

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/lightdm-ci/203/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-06 23:09:59 +0000
+++ debian/changelog	2013-10-08 20:51:36 +0000
@@ -1,3 +1,10 @@
+lightdm (1.7.18-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/lightdm-session:
+    - Handle xrdb, setxkbmap and xmodmap not being installed (LP: #1236317)
+
+ -- Robert Ancell <[e-mail]>  Wed, 09 Oct 2013 09:46:39 +1300
+
 lightdm (1.7.18-0ubuntu1) saucy; urgency=low
 
   * New upstream release:

=== modified file 'debian/lightdm-session'
--- debian/lightdm-session	2013-07-16 23:36:16 +0000
+++ debian/lightdm-session	2013-10-08 20:51:36 +0000
@@ -29,36 +29,42 @@
 done
 
 # Load resources
-xresourcedir="/etc/X11/Xresources"
-if [ -d "$xresourcedir" ]; then
-    for file in $xresourcedir/*; do
-        echo "Loading resource: $file"
-        xrdb -nocpp -merge "$file"
-    done
-fi
-xresourcefile="$HOME/.Xresources"
-if [ -f "$xresourcefile" ]; then
-    echo "Loading resource: $xresourcefile"
-    xrdb -nocpp -merge "$xresourcefile"
-fi
+if type xrdb >/dev/null 2>&1; then
+    xresourcedir="/etc/X11/Xresources"
+    if [ -d "$xresourcedir" ]; then
+        for file in $xresourcedir/*; do
+            echo "Loading resource: $file"
+            xrdb -nocpp -merge "$file"
+        done
+    fi
+    xresourcefile="$HOME/.Xresources"
+    if [ -f "$xresourcefile" ]; then
+        echo "Loading resource: $xresourcefile"
+        xrdb -nocpp -merge "$xresourcefile"
+    fi
+fi    
 
 # Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
-    if [ -f "$file" ]; then
-        echo "Loading keymap: $file"
-        setxkbmap `cat "$file"`
-        XKB_IN_USE=yes
-    fi
-done    
+if type setxkbmap >/dev/null 2>&1; then
+    for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+        if [ -f "$file" ]; then
+            echo "Loading keymap: $file"
+            setxkbmap `cat "$file"`
+            XKB_IN_USE=yes
+        fi
+    done
+fi
 
 # Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
-    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
-        if [ -f "$file" ]; then
-           echo "Loading modmap: $file"
-           xmodmap "$file"
-        fi
-    done
+if type xmodmap >/dev/null 2>&1; then
+    if [ -z "$XKB_IN_USE" ]; then
+        for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+            if [ -f "$file" ]; then
+               echo "Loading modmap: $file"
+               xmodmap "$file"
+            fi
+        done
+    fi
 fi
 
 unset XKB_IN_USE