r1912 - trunk/kbd

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Feb 26 16:02:53 PST 2008


Author: ken
Date: 2008-02-26 17:02:53 -0700 (Tue, 26 Feb 2008)
New Revision: 1912

Added:
   trunk/kbd/kbd-1.13-backspace-1.patch
Log:
Updated backspace patch for kbd-1.13.

Added: trunk/kbd/kbd-1.13-backspace-1.patch
===================================================================
--- trunk/kbd/kbd-1.13-backspace-1.patch	                        (rev 0)
+++ trunk/kbd/kbd-1.13-backspace-1.patch	2008-02-27 00:02:53 UTC (rev 1912)
@@ -0,0 +1,246 @@
+Submitted By: Alexander E. Patrakov
+Date: 2005-05-16
+Initial Package Version: 1.12
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Obsoletes the /etc/kbd/bs-sends-del file for i386.  Updated for 1.13 (drop
+ru.map, the change is upstream, and add ru_win.map, ru-cp1251.map) by
+Ken Moffat <ken at linuxfromscratch dot org>
+
+diff -Naur kbd-1.13.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.13/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.13.orig/data/keymaps/i386/dvorak/dvorak-l.map	2002-10-11 12:08:51.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/dvorak/dvorak-l.map	2008-02-26 20:58:50.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = three		numbersign
+ 		keycode  12 = two		at
+ 		keycode  13 = one		exclam
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.13.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.13/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.13.orig/data/keymaps/i386/dvorak/dvorak-r.map	2002-10-11 12:08:51.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/dvorak/dvorak-r.map	2008-02-26 20:58:50.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = slash		question
+ 		keycode  12 = bracketleft	braceleft
+ 		keycode  13 = bracketright	braceright
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.13.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.13/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.13.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-02-26 20:58:50.000000000 +0000
+@@ -51,7 +51,7 @@
+ 	alt     keycode  12 = Meta_minus      
+ keycode  13 = minus            underscore      
+ 	alt     keycode  13 = Meta_equal      
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	alt     keycode  14 = Meta_Delete     
+ keycode  15 = Tab              Meta_Tab             
+ 	alt     keycode  15 = Meta_Tab        
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.13/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/lt.l4.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/lt.l4.map	2008-02-26 20:58:50.000000000 +0000
+@@ -205,7 +205,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode	 14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete	 	 Delete \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -507,7 +507,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/lt.map kbd-1.13/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/lt.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/lt.map	2008-02-26 20:58:50.000000000 +0000
+@@ -204,7 +204,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode	 14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete	 	 Delete  \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -506,7 +506,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.13/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/no-latin1.map	2002-10-11 12:08:49.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/no-latin1.map	2008-02-26 20:58:50.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho at ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ 	plain keycode  83 = KP_Comma
+-	plain keycode 111 = Delete		# "Remove" originally, weird...
++	plain keycode 111 = Remove
+ strings as usual
+ 
+ 	keycode   1 = Escape
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.13/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ru1.map	2002-10-13 01:02:30.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ru1.map	2008-02-26 20:58:50.000000000 +0000
+@@ -143,8 +143,8 @@
+ 
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr		keycode 27 = 	+0xDF
+-# altgr	shift 	keycode 27 = 	+0xFF
++altgr		keycode 27 = 	+0xDF
++altgr	shift 	keycode 27 = 	+0xFF
+ 	control	keycode	27 =	Control_bracketright
+ altgr	control	keycode	27 =	Control_bracketright
+ 	alt	keycode	27 =	Meta_bracketright
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.13/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ru2.map	2002-10-13 01:05:47.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ru2.map	2008-02-26 20:58:50.000000000 +0000
+@@ -46,7 +46,7 @@
+ 	alt	keycode	12 =	Meta_minus
+ 		keycode	13 =	equal	plus		equal	plus
+ 	alt	keycode	13 =	Meta_equal
+-		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode	14 =	Delete Delete	Delete Delete
+ 	alt	keycode	14 =	Meta_Delete
+ 		keycode	15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode	15 =	Meta_Tab	
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.13/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ru-cp1251.map	2002-10-13 01:02:01.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ru-cp1251.map	2008-02-26 23:06:29.000000000 +0000
+@@ -39,7 +39,7 @@
+ 	alt	keycode	12 =	Meta_minus
+ 		keycode	13 =	equal	plus		equal	plus
+ 	alt	keycode	13 =	Meta_equal
+-		keycode	14 =	BackSpace
++		keycode	14 =	Delete
+ 	alt	keycode	14 =	Meta_Delete
+ 		keycode	15 =	Tab
+ 	alt	keycode	15 =	Meta_Tab	
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.13/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ru-ms.map	2002-10-13 01:07:05.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ru-ms.map	2008-02-26 20:58:50.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr	alt     keycode 13 =    Meta_equal
+ 	shift alt keycode 13 = 	Meta_plus
+ altgr	shift alt keycode 13 = 	Meta_plus
+-		keycode 14 = 	BackSpace  BackSpace  BackSpace  BackSpace
+-#		keycode 14 = 	Delete  Delete  Delete  Delete
++#		keycode 14 = 	BackSpace  BackSpace  BackSpace  BackSpace
++		keycode 14 = 	Delete  Delete  Delete  Delete
+ 	alt	keycode	14 =	Meta_Delete
+ altgr	alt     keycode 14 = 	Meta_Delete
+ 		keycode	15 =	Tab	Tab		Tab	Tab	
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.13/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ru_win.map	2002-10-13 01:06:03.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ru_win.map	2008-02-26 23:06:03.000000000 +0000
+@@ -42,7 +42,7 @@
+ 	alt	keycode	12 =	Meta_minus
+ 		keycode	13 =	equal	plus		equal	plus
+ 	alt	keycode	13 =	Meta_equal
+-		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode	14 =	Delete	Delete		Delete	Delete
+ 	alt	keycode	14 =	Meta_Delete
+ 		keycode	15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode	15 =	Meta_Tab	
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.13/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/se-ir209.map	2002-10-13 01:12:48.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/se-ir209.map	2008-02-26 20:58:50.000000000 +0000
+@@ -345,7 +345,7 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+ 
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.13/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/se-lat6.map	2002-10-13 01:13:01.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/se-lat6.map	2008-02-26 20:58:50.000000000 +0000
+@@ -374,6 +374,6 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.13/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/tr_q-latin5.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-02-26 20:58:50.000000000 +0000
+@@ -49,7 +49,7 @@
+ 	alt     keycode  12 = Meta_minus
+ keycode  13 = minus            underscore
+ 	alt     keycode  13 = Meta_equal
+-keycode  14 = BackSpace           Delete
++keycode  14 = Delete           Delete
+ 	alt     keycode  14 = Meta_Delete
+ keycode  15 = Tab              Meta_Tab
+ 	alt     keycode  15 = Meta_Tab
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ua.map kbd-1.13/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ua.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ua.map	2008-02-26 20:58:50.000000000 +0000
+@@ -249,7 +249,7 @@
+ 	shift ctrll ctrlr keycode 13 = plus
+ 	alt ctrll ctrlr keycode 13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode 14 = BackSpace
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.13/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ua-utf.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ua-utf.map	2008-02-26 20:58:50.000000000 +0000
+@@ -250,7 +250,7 @@
+ 	shift ctrll ctrlr keycode 13 = plus
+ 	alt ctrll ctrlr keycode 13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode 14 = BackSpace
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.13/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ua-utf-ws.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-02-26 20:58:50.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode 13 = plus
+ 	alt ctrll ctrlr keycode 13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode 14 = BackSpace
+diff -Naur kbd-1.13.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.13/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.13.orig/data/keymaps/i386/qwerty/ua-ws.map	2007-05-08 22:12:20.000000000 +0100
++++ kbd-1.13/data/keymaps/i386/qwerty/ua-ws.map	2008-02-26 20:58:50.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode 13 = plus
+ 	alt ctrll ctrlr keycode 13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode 14 = BackSpace




More information about the patches mailing list