summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-05-21 11:54:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-21 11:54:58 +0000
commitbc6202b190738b8a44174cbfff98a608d0ee8b45 (patch)
tree12b2dff771699081a77d79873864c26b8aaee9d3
parent0abe42ac0868f2b4fe996e824049afa5fa2ebf3d (diff)
parent229b799c419f274c7aa3fc537f1cc74d291aaf0f (diff)
merge of 43210f598efbfe0448fd76adff3e7c54597c1238
and 9f0cf5f918714fddd0ea186781b4d1a4ffc876bd
-rw-r--r--packages/xserver-common/files/poodle-xmodmap-2.6.patch42
-rw-r--r--packages/xserver-common/xserver-common_1.9.bb5
2 files changed, 45 insertions, 2 deletions
diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xserver-common/files/poodle-xmodmap-2.6.patch
new file mode 100644
index 0000000000..73cf3f6ffb
--- /dev/null
+++ b/packages/xserver-common/files/poodle-xmodmap-2.6.patch
@@ -0,0 +1,42 @@
+diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap
+--- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200
++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200
+@@ -9,6 +9,9 @@
+ "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz")
+ xmodmap - < /etc/X11/slcXXXX.xmodmap
+ ;;
++ "SHARP Poodle")
++ xmodmap - < /etc/X11/poodle.xmodmap
++ ;;
+ "Sharp-Collie")
+ xmodmap - < /etc/X11/collie.xmodmap
+ ;;
+diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap
+--- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100
++++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200
+@@ -0,0 +1,25 @@
++keycode 37 = Control_L
++keycode 64 = Alt_L
++
++
++keycode 50 = Shift_L
++keycode 62 = Shift_R
++keycode 75 = Mode_switch
++
++
++
++clear control
++clear shift
++clear lock
++clear mod4
++clear mod1
++
++add control = Control_L
++add shift = Shift_L Shift_R
++add lock = Caps_Lock
++
++! This is AltGr
++add mod4 = Mode_switch
++
++add mod1 = Alt_L
++
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb
index dd4e36b19c..de81537f99 100644
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ b/packages/xserver-common/xserver-common_1.9.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+PR = "r1"
PACKAGE_ARCH = "all"
@@ -11,7 +11,8 @@ PACKAGE_ARCH = "all"
inherit gpe
SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1"
+ file://calibrate_zaurusd.patch;patch=1 \
+ file://poodle-xmodmap-2.6.patch;patch=1"
do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"