diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-12-15 16:09:02 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-15 16:09:02 +0100 |
| commit | fb019470a78a0a6edec57f491b4b8244a6ea85a8 (patch) | |
| tree | 979cabd4b7b41ffe0919938a42525bb823b017be /ubuntu | |
| parent | 72ac3a0a08befd4b584baedf0222076cdc5243c8 (diff) | |
| download | tde-packaging-fb019470a78a0a6edec57f491b4b8244a6ea85a8.tar.gz tde-packaging-fb019470a78a0a6edec57f491b4b8244a6ea85a8.zip | |
Fix 80ubuntu-xmodmap in tdebase on Debian and Ubuntu
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap | 4 | ||||
| -rw-r--r-- | ubuntu/precise/tdebase/debian/80ubuntu-xmodmap | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap +++ b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap @@ -2,11 +2,13 @@ # # This file is sourced by Xsession(5), not executed. # The "|| true" is to ensure that the Xsession script does not terminate on error -/usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true USRMODMAP="$HOME/.Xmodmap" if [ -x /usr/bin/xmodmap ]; then + if [ -f /usr/share/apps/kxkb/ubuntu.xmodmap ]; then + /usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true + fi if [ -f "$USRMODMAP" ]; then /usr/bin/xmodmap "$USRMODMAP" || true fi diff --git a/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap b/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap +++ b/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap @@ -2,11 +2,13 @@ # # This file is sourced by Xsession(5), not executed. # The "|| true" is to ensure that the Xsession script does not terminate on error -/usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true USRMODMAP="$HOME/.Xmodmap" if [ -x /usr/bin/xmodmap ]; then + if [ -f /usr/share/apps/kxkb/ubuntu.xmodmap ]; then + /usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true + fi if [ -f "$USRMODMAP" ]; then /usr/bin/xmodmap "$USRMODMAP" || true fi |