diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-07-02 11:15:42 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-07-02 11:15:42 +1200 |
| commit | fcba88c1ad99db34963e28038a373b4fb0c63c88 (patch) | |
| tree | 297df0321e0c2617cc37ec835cb4fe8ee600a8bb | |
| parent | 1263b562a5a9c5543c0e321cc87bc23217f8f238 (diff) | |
| download | lightdm-git-fcba88c1ad99db34963e28038a373b4fb0c63c88.tar.gz | |
debian/lightdm-session: Enable the C preprocessor
when loading X resources. (LP: #1244578).
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/lightdm-session | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e80e4b63..3a4ef71a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lightdm (1.10.5-0ubuntu1.1) trusty; urgency=medium + + * debian/lightdm-session: Enable the C preprocessor + when loading X resources. (LP: #1244578). + + -- Jorge Niedbalski <jorge.niedbalski@canonical.com> Mon, 15 Jun 2015 13:39:27 -0500 + lightdm (1.10.5-0ubuntu1) trusty; urgency=medium * New upstream release: diff --git a/debian/lightdm-session b/debian/lightdm-session index 4d3020b1..dd5cd398 100644 --- a/debian/lightdm-session +++ b/debian/lightdm-session @@ -47,15 +47,15 @@ if type xrdb >/dev/null 2>&1; then 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 |