[Glibc-bsd-commits] r3796 - in trunk/kfreebsd-8/debian: . arch/amd64 arch/i386 patches
Robert Millan
rmh at alioth.debian.org
Tue Nov 1 11:25:08 UTC 2011
Author: rmh
Date: 2011-11-01 11:25:08 +0000 (Tue, 01 Nov 2011)
New Revision: 3796
Added:
trunk/kfreebsd-8/debian/patches/919_delete_key.diff
Modified:
trunk/kfreebsd-8/debian/arch/amd64/amd64.config
trunk/kfreebsd-8/debian/arch/i386/486.config
trunk/kfreebsd-8/debian/arch/i386/686-smp.config
trunk/kfreebsd-8/debian/arch/i386/686.config
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/control.flavor.in
trunk/kfreebsd-8/debian/patches/series
Log:
* Enable TEKEN_XTERM.
* Recover 918_delete_key.diff patch from r3199. (Closes: #605065)
Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2011-11-01 11:25:08 UTC (rev 3796)
@@ -17,6 +17,7 @@
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
+options TEKEN_XTERM
# Network options
device carp
Modified: trunk/kfreebsd-8/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/486.config 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config 2011-11-01 11:25:08 UTC (rev 3796)
@@ -17,6 +17,7 @@
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
+options TEKEN_XTERM
# Network options
device carp
Modified: trunk/kfreebsd-8/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2011-11-01 11:25:08 UTC (rev 3796)
@@ -18,6 +18,7 @@
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
+options TEKEN_XTERM
# Network options
device carp
Modified: trunk/kfreebsd-8/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686.config 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config 2011-11-01 11:25:08 UTC (rev 3796)
@@ -15,6 +15,7 @@
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
+options TEKEN_XTERM
# Network options
device carp
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/changelog 2011-11-01 11:25:08 UTC (rev 3796)
@@ -1,3 +1,10 @@
+kfreebsd-8 (8.2-12) UNRELEASED; urgency=low
+
+ * Enable TEKEN_XTERM.
+ * Recover 918_delete_key.diff patch from r3199. (Closes: #605065)
+
+ -- Robert Millan <rmh at debian.org> Tue, 01 Nov 2011 12:24:50 +0100
+
kfreebsd-8 (8.2-11) unstable; urgency=low
[ Aurelien Jarno ]
Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/control.flavor.in 2011-11-01 11:25:08 UTC (rev 3796)
@@ -1,6 +1,8 @@
Package: kfreebsd-image- at version@- at abiname@- at flavor@
Architecture: any- at arch@
-Depends: freebsd-utils (>= 8.1-5) [kfreebsd-any], kldutils (>= 7.1) [kfreebsd-any], ${misc:Depends}
+Depends: freebsd-utils (>= 8.1-5) [kfreebsd-any], kldutils (>= 7.1) [kfreebsd-any], ${misc:Depends},
+# Policy-conformant keyboard mappings (see #605777)
+ kbdcontrol (>= 8.2+ds2-6),
Conflicts: kfreebsd-loader (<< 5.4-1.3)
Provides: kfreebsd-image- at major@, kfreebsd-image
Recommends: @recommends@
Copied: trunk/kfreebsd-8/debian/patches/919_delete_key.diff (from rev 3790, trunk/kfreebsd-10/debian/patches/919_delete_key.diff)
===================================================================
--- trunk/kfreebsd-8/debian/patches/919_delete_key.diff (rev 0)
+++ trunk/kfreebsd-8/debian/patches/919_delete_key.diff 2011-11-01 11:25:08 UTC (rev 3796)
@@ -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 2011-10-30 21:43:32 UTC (rev 3795)
+++ trunk/kfreebsd-8/debian/patches/series 2011-11-01 11:25:08 UTC (rev 3796)
@@ -38,6 +38,7 @@
916_NKPT_amd64.diff
917_track_alignment.diff
918_unix_socket_overflow.diff
+919_delete_key.diff
950_no_stack_protector.diff
999_config.diff
999_firmware.diff
More information about the Glibc-bsd-commits
mailing list