[Glibc-bsd-commits] r3199 - in trunk/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2010-12-03 11:17:47 +0000 (Fri, 03 Dec 2010)
New Revision: 3199

Added:
   trunk/kfreebsd-8/debian/patches/918_delete_key.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
Add 918_delete_key.diff to conform to Debian Policy, 9.8 Keyboard configuration. Closes: #605065.



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-11-27 14:03:13 UTC (rev 3198)
+++ trunk/kfreebsd-8/debian/changelog	2010-12-03 11:17:47 UTC (rev 3199)
@@ -1,13 +1,18 @@
 kfreebsd-8 (8.1+dfsg-7) UNRELEASED; urgency=low
 
+  [ Robert Millan ] 
   * Add 917_track_alignment.diff to remove obsolete warning about track
-    alignment in MSDOS partitions.  (Closes: #603380)
+    alignment in MSDOS partitions. Closes: #603380.
+  
+  [ Petr Salinger ]
+  * Add 918_delete_key.diff to conform to Debian Policy,
+    9.8 Keyboard configuration. Closes: #605065.
 
  -- Robert Millan <rmh at debian.org>  Sat, 27 Nov 2010 14:53:56 +0100
 
 kfreebsd-8 (8.1+dfsg-6) unstable; urgency=low
 
-  [ Petr Salinger]
+  [ Petr Salinger ]
   * Drop non-free firmware. Closes: #594940.
     - prune .orig.tar.gz
     - disable firmware in kernel via 999_config.diff
@@ -34,7 +39,7 @@
 
 kfreebsd-8 (8.1-4) unstable; urgency=low
 
-  [ Petr Salinger]
+  [ Petr Salinger ]
   * Report i686 instead of i386 on amd64 machine for 32-bit binaries.
   * Teach how to handle orig_pair ESC sequence for TERM=cons25.
     Closes: #559364.    

Added: trunk/kfreebsd-8/debian/patches/918_delete_key.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/918_delete_key.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/918_delete_key.diff	2010-12-03 11:17:47 UTC (rev 3199)
@@ -0,0 +1,34 @@
+Debian Policy 9.8 Keyboard configuration
+
+The (Linux) console is configured to make <-- generate DEL, and Delete generate ESC [ 3 ~.
+
+
+--- a/sys/dev/kbd/kbdtables.h
++++ b/sys/dev/kbd/kbdtables.h
+@@ -56,7 +56,7 @@
+ /*0b*/{{  '0',   ')',   NOP,   NOP,   '0',   ')',   NOP,   NOP, }, 0x33,0x00 },
+ /*0c*/{{  '-',   '_',  0x1F,  0x1F,   '-',   '_',  0x1F,  0x1F, }, 0x00,0x00 },
+ /*0d*/{{  '=',   '+',   NOP,   NOP,   '=',   '+',   NOP,   NOP, }, 0x33,0x00 },
+-/*0e*/{{ 0x08,  0x08,  0x7F,  0x7F,  0x08,  0x08,  0x7F,  0x7F, }, 0x00,0x00 },
++/*0e*/{{ 0x7F,  0x7F,  0x7F,  0x7F,  0x08,  0x08,  0x7F,  0x7F, }, 0x00,0x00 },
+ /*0f*/{{ 0x09,  BTAB,   NOP,   NOP,  0x09,  BTAB,   NOP,   NOP, }, 0x77,0x00 },
+ /*10*/{{  'q',   'Q',  0x11,  0x11,   'q',   'Q',  0x11,  0x11, }, 0x00,0x01 },
+ /*11*/{{  'w',   'W',  0x17,  0x17,   'w',   'W',  0x17,  0x17, }, 0x00,0x01 },
+@@ -125,7 +125,7 @@
+ /*50*/{{ F(58),  '2',   '2',   '2',   '2',   '2',   '2',   '2', }, 0x80,0x02 },
+ /*51*/{{ F(59),  '3',   '3',   '3',   '3',   '3',   '3',   '3', }, 0x80,0x02 },
+ /*52*/{{ F(60),  '0',   '0',   '0',   '0',   '0',   '0',   '0', }, 0x80,0x02 },
+-/*53*/{{ 0x7F,   '.',   '.',   '.',   '.',   '.',   RBT,   RBT, }, 0x03,0x02 },
++/*53*/{{ F(61),  '.',   '.',   '.',   '.',   '.',   RBT,   RBT, }, 0x83,0x02 },
+ /*54*/{{  NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP, }, 0xFF,0x00 },
+ /*55*/{{  NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP, }, 0xFF,0x00 },
+ /*56*/{{  NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP,   NOP, }, 0xFF,0x00 },
+@@ -226,7 +226,7 @@
+ /* 49-52 */	{"\033[H", 3}, {"\033[A", 3}, {"\033[I", 3}, {"-"     , 1},
+ /* 53-56 */	{"\033[D", 3}, {"\033[E", 3}, {"\033[C", 3}, {"+"     , 1},
+ /* 57-60 */	{"\033[F", 3}, {"\033[B", 3}, {"\033[G", 3}, {"\033[L", 3},
+-/* 61-64 */	{"\177", 1},   {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
++/* 61-64 */	{"\033[3~",4}, {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
+ /* 65-68 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
+ /* 69-72 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
+ /* 73-76 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2010-11-27 14:03:13 UTC (rev 3198)
+++ trunk/kfreebsd-8/debian/patches/series	2010-12-03 11:17:47 UTC (rev 3199)
@@ -30,6 +30,8 @@
 914_psm.diff
 915_ip6.v6only.diff
 916_NKPT_amd64.diff
+917_track_alignment.diff
+918_delete_key.diff
 950_no_stack_protector.diff
 999_config.diff
 999_firmware.diff