summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdebase/debian/80ubuntu-xmodmap4
-rw-r--r--debian/squeeze/tdebase/debian/80ubuntu-xmodmap4
-rw-r--r--debian/wheezy/tdebase/debian/80ubuntu-xmodmap4
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/lenny/tdebase/debian/80ubuntu-xmodmap b/debian/lenny/tdebase/debian/80ubuntu-xmodmap
index 27a318d73..7774dd9b8 100644
--- a/debian/lenny/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/lenny/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/debian/squeeze/tdebase/debian/80ubuntu-xmodmap b/debian/squeeze/tdebase/debian/80ubuntu-xmodmap
index 27a318d73..7774dd9b8 100644
--- a/debian/squeeze/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/squeeze/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/debian/wheezy/tdebase/debian/80ubuntu-xmodmap b/debian/wheezy/tdebase/debian/80ubuntu-xmodmap
index 27a318d73..7774dd9b8 100644
--- a/debian/wheezy/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/wheezy/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