[oe-commits] org.oe.dev keymaps: fix keymap for collie/2.6 - close #1996

[Thomas commit]

keymaps: fix keymap for collie/2.6 - close #1996

Author: Thomas
Branch: org.openembedded.dev
Revision: fc25101f37442915e9b2899a4383cb5bb412b44f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fc25101f37442915e9b2899a4383cb5bb412b44f
Files:
1
packages/keymaps/files/collie/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
Diffs:

#
# mt diff -r426022a70eefa9cef4f266532c2febde719d5cd9 -rfc25101f37442915e9b2899a4383cb5bb412b44f
#
# 
# 
# patch "packages/keymaps/files/collie/keymap-2.6.map"
#  from [7c72c2e8b68396eab751a0e649029dc354d97eb3]
#    to [9ae351dfb21f9a85ee2f904e947faa5073a26a34]
# 
# patch "packages/keymaps/keymaps_1.0.bb"
#  from [b8bf5423b14e0a10cb0a3ee85d3b36af30dbdf51]
#    to [33fb9d5be81731b986f034509b2a4aab8152497e]
# 
============================================================
--- packages/keymaps/files/collie/keymap-2.6.map	7c72c2e8b68396eab751a0e649029dc354d97eb3
+++ packages/keymaps/files/collie/keymap-2.6.map	9ae351dfb21f9a85ee2f904e947faa5073a26a34
@@ -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 108 = Down            
 keycode 106 = Right           
 keycode 107 = Select          
 keycode 108 = Down            
+keycode 116  = Escape          
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
============================================================
--- packages/keymaps/keymaps_1.0.bb	b8bf5423b14e0a10cb0a3ee85d3b36af30dbdf51
+++ packages/keymaps/keymaps_1.0.bb	33fb9d5be81731b986f034509b2a4aab8152497e
@@ -1,9 +1,9 @@ PACKAGE_ARCH = "${MACHINE}"
 DESCRIPTION = "Keyboard map"
 SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r13"
+PR = "r14"
 
 inherit update-rc.d