diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-12 13:14:14 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-12 13:14:14 +0000 |
| commit | 3524b34212fdab21c6882324b85efcc65dd6238c (patch) | |
| tree | 1214a0b6b12a6e6e243abf6d27db52d56530bc45 | |
| parent | 8bf985a982ad37e55af7fce9f9fbc284a202e93a (diff) | |
| parent | d591b320402f2069960fe1bc5f50d96e1b01efb0 (diff) | |
merge of '05e24f5610763d569f2c11c8f26e2152e34063bb'
and 'fc25101f37442915e9b2899a4383cb5bb412b44f'
| -rw-r--r-- | packages/keymaps/files/collie/keymap-2.6.map | 6 | ||||
| -rw-r--r-- | packages/keymaps/keymaps_1.0.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/keymaps/files/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map index 9aca5abb38..13eb7d2881 100644 --- a/packages/keymaps/files/collie/keymap-2.6.map +++ b/packages/keymaps/files/collie/keymap-2.6.map @@ -6,7 +6,6 @@ # as Altgr, and simply use a proper keymap. Said keymap is as # follows. # keymaps 0-2,4-5,8,12,20 -keycode 1 = Escape Escape keycode 14 = BackSpace shift keycode 14 = BackSpace control keycode 14 = Delete @@ -147,7 +146,7 @@ keycode 53 = slash control keycode 53 = Num_Lock shiftl control keycode 53 = Num_Lock control shiftr keycode 53 = Num_Lock -keycode 54 = Shift +keycode 54 = AltGr keycode 55 = KP_Multiply keycode 56 = Alt keycode 57 = space @@ -155,7 +154,7 @@ keycode 57 = space control keycode 57 = nul shiftl control keycode 57 = grave control shiftr keycode 57 = grave -keycode 97 = Control +keycode 67 = Control keycode 99 = Control_backslash control keycode 99 = Control_backslash keycode 100 = AltGr @@ -164,6 +163,7 @@ keycode 105 = Left keycode 106 = Right keycode 107 = Select keycode 108 = Down +keycode 116 = Escape string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index 08fbc1eed5..0508facaa6 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 = "r13" +PR = "r14" inherit update-rc.d |