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:13:14 +0100 |
| commit | 5b6ac8585cdbe55e9384e3b5188a273b0980f2ee (patch) | |
| tree | 022008f4ae2c96e6e379fe7a3755b6ae0b639154 | |
| parent | 69c671dcfb73fd1a249ae7cf61bb5c84d7732709 (diff) | |
| download | tde-packaging-5b6ac8585cdbe55e9384e3b5188a273b0980f2ee.tar.gz tde-packaging-5b6ac8585cdbe55e9384e3b5188a273b0980f2ee.zip | |
Fix 80ubuntu-xmodmap in tdebase on Debian and Ubuntu
(cherry picked from commit fb019470a78a0a6edec57f491b4b8244a6ea85a8)
| -rw-r--r-- | debian/lenny/kdebase/debian/80ubuntu-xmodmap | 4 | ||||
| -rw-r--r-- | debian/squeeze/kdebase/debian/80ubuntu-xmodmap | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/kdebase/debian/80ubuntu-xmodmap | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/lenny/kdebase/debian/80ubuntu-xmodmap b/debian/lenny/kdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/debian/lenny/kdebase/debian/80ubuntu-xmodmap +++ b/debian/lenny/kdebase/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/debian/squeeze/kdebase/debian/80ubuntu-xmodmap b/debian/squeeze/kdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/debian/squeeze/kdebase/debian/80ubuntu-xmodmap +++ b/debian/squeeze/kdebase/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/maverick/kdebase/debian/80ubuntu-xmodmap b/ubuntu/maverick/kdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/ubuntu/maverick/kdebase/debian/80ubuntu-xmodmap +++ b/ubuntu/maverick/kdebase/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 |