summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-11-05 11:51:44 +0100
committeralbator <albator@arcadia.vtf>2011-11-05 11:51:44 +0100
commit70bc259aa3f4dbd83bd239030690759449ee714b (patch)
treeb61af2d70c64ca12dbec49053c0b20dae8ba7926 /ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
parent1f3a44f73fa43d3c30f47ff8c4f5c414d83f4765 (diff)
parent169853a068683db6540e3b77542d5139bb7867d1 (diff)
downloadtde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.tar.gz
tde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap')
-rw-r--r--ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap13
1 files changed, 13 insertions, 0 deletions
diff --git a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
new file mode 100644
index 000000000..27a318d73
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
@@ -0,0 +1,13 @@
+# Set the Ubuntu laptop keycode -> xkeysyms mapping (used by KDE)
+#
+# 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 "$USRMODMAP" ]; then
+ /usr/bin/xmodmap "$USRMODMAP" || true
+ fi
+fi