diff -Nru lightdm-1.14.2/debian/changelog lightdm-1.14.2/debian/changelog --- lightdm-1.14.2/debian/changelog 2015-05-26 02:00:24.000000000 +0000 +++ lightdm-1.14.2/debian/changelog 2015-06-15 18:09:12.000000000 +0000 @@ -1,3 +1,10 @@ +lightdm (1.14.2-0ubuntu1.1) vivid; urgency=medium + + * debian/lightdm-session: Enable the C preprocessor + when loading X resources. (LP: #1244578). + + -- Jorge Niedbalski Mon, 15 Jun 2015 11:39:09 -0500 + lightdm (1.14.2-0ubuntu1) vivid; urgency=medium * New upstream release: diff -Nru lightdm-1.14.2/debian/lightdm-session lightdm-1.14.2/debian/lightdm-session --- lightdm-1.14.2/debian/lightdm-session 2015-05-26 00:49:19.000000000 +0000 +++ lightdm-1.14.2/debian/lightdm-session 2015-06-15 16:39:06.000000000 +0000 @@ -47,15 +47,15 @@ if [ -d "$xresourcedir" ]; then for file in $xresourcedir/*; do echo "Loading resource: $file" - xrdb -nocpp -merge "$file" + xrdb -merge "$file" done fi xresourcefile="$HOME/.Xresources" if [ -f "$xresourcefile" ]; then echo "Loading resource: $xresourcefile" - xrdb -nocpp -merge "$xresourcefile" + xrdb -merge "$xresourcefile" fi -fi +fi # Load keymaps if type setxkbmap >/dev/null 2>&1; then