summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-13 17:37:20 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-13 17:37:20 +0000
commit4fc1def46d15bbb899ab003df07a4b0f472d01bb (patch)
tree76ff425af3434d51eebf972dc17696a44fe1527b
parent672fe5a52653790783da41d4809ba763d0e49e27 (diff)
parent99c7efe53fde6bb7df389ef80dd964b896f1ad87 (diff)
merge of '3b41707c8c7d8ea4e1adb918870bd216fdd78078'
and 'b6ebdc133a282a20876e945c411c3c30af2c008b'
-rw-r--r--packages/keymaps/files/poodle/keymap-2.6.map16
-rw-r--r--packages/keymaps/keymaps_1.0.bb2
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/keymaps/files/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map
index a39b886f5d..525551837d 100644
--- a/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/packages/keymaps/files/poodle/keymap-2.6.map
@@ -1,13 +1,13 @@
keymaps 0-2,4,8,12
# Default Shift AltGr Control Alt Ctrl+Alt
-keycode 29 = SControl # Calendar
-keycode 60 = SAlt # Address
-keycode 63 = space #Select
+keycode 29 = Control # Calendar
+keycode 60 = Alt # Address
+keycode 63 = space # Select
keycode 68 = F13 # Mail
-keycode 87 = F33 #OK
+keycode 87 = F33 # OK
keycode 88 = F11 # Menu
-keycode 102 = F12 # Home
+keycode 99 = F12 # Home
keycode 103 = Up Up Prior
keycode 105 = Left Left Decr_Console
keycode 106 = Right Right Incr_Console
@@ -18,13 +18,13 @@ keycode 14 = BackSpace BackSpace Delete
keycode 15 = Tab backslash Caps_Lock
keycode 28 = Return Return greater
keycode 40 = apostrophe quotedbl tilde
-keycode 42 = SShift
+keycode 42 = Shift
keycode 51 = comma semicolon parenright
keycode 52 = period colon less
keycode 53 = slash question Num_Lock
-keycode 54 = SShift
+keycode 54 = Shift
keycode 57 = space bar bar
-keycode 67 = SAltGr
+keycode 67 = AltGr
keycode 16 = +q +Q one Control_q Meta_q
keycode 17 = +w +W two Control_w Meta_w
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index bf60ce0448..dd10b64099 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
RDEPENDS = "initscripts console-tools"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE}"
-PR = "r17"
+PR = "r18"
inherit update-rc.d