From 5b6ac8585cdbe55e9384e3b5188a273b0980f2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 15 Dec 2012 16:09:02 +0100 Subject: Fix 80ubuntu-xmodmap in tdebase on Debian and Ubuntu (cherry picked from commit fb019470a78a0a6edec57f491b4b8244a6ea85a8) --- debian/lenny/kdebase/debian/80ubuntu-xmodmap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/lenny/kdebase/debian/80ubuntu-xmodmap') 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 -- cgit v1.2.3