diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-07-02 11:17:04 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-07-02 11:17:04 +1200 |
| commit | 1ab815cf4045799387bf65d09e59ec3fd1d7006a (patch) | |
| tree | 4cdfa57265ecfed2c3e52fcc1a595272f43882e7 | |
| parent | 23796ad608d945ce227b28d553481352ee79a088 (diff) | |
| download | lightdm-git-lightdm-1-12.tar.gz | |
debian/lightdm-session: Enable the C preprocessor lightdm-1-12
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 2493ed6a..fd4147c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lightdm (1.12.3-0ubuntu1.1) utopic; 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:33:30 -0500 + lightdm (1.12.3-0ubuntu1) utopic; 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 |