X Strike Force XFree86 SVN commit: r1914 - in trunk/debian: . patches
Author: barbier
Date: 2004-10-07 14:40:46 -0500 (Thu, 07 Oct 2004)
New Revision: 1914
Added:
trunk/debian/patches/101b_xkb_sun_loads_srvr_ctrl.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
Make Sun keyboards load srvr_ctrl(xfree86) symbol definitions to have
access to standard Ctrl+Alt key sequences. (Closes: #236086, #274607)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-05 22:45:24 UTC (rev 1913)
+++ trunk/debian/CHANGESETS 2004-10-07 19:40:46 UTC (rev 1914)
@@ -21,4 +21,8 @@
not others?
1908, 1913
+Make Sun keyboards load srvr_ctrl(xfree86) symbol definitions to have
+access to standard Ctrl+Alt key sequences. (Closes: #236086, #274607)
+ 1914
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-05 22:45:24 UTC (rev 1913)
+++ trunk/debian/changelog 2004-10-07 19:40:46 UTC (rev 1914)
@@ -14,6 +14,11 @@
files and xc/programs/xkbcomp/symbols/pc/Imakefile so that this keymap
gets shipped. (Closes: #271326, #274513)
+ Changes by Denis Barbier:
+
+ * Make Sun keyboards load srvr_ctrl(xfree86) symbol definitions to have
+ access to standard Ctrl+Alt key sequences. (Closes: #236086, #274607)
+
-- Branden Robinson <branden@debian.org> Mon, 4 Oct 2004 01:22:37 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Added: trunk/debian/patches/101b_xkb_sun_loads_srvr_ctrl.diff
===================================================================
--- trunk/debian/patches/101b_xkb_sun_loads_srvr_ctrl.diff 2004-10-05 22:45:24 UTC (rev 1913)
+++ trunk/debian/patches/101b_xkb_sun_loads_srvr_ctrl.diff 2004-10-07 19:40:46 UTC (rev 1914)
@@ -0,0 +1,65 @@
+$Id$
+
+This patch by Denis Barbier
+
+Add support for standard Ctrl+Alt sequences to Sun keyboards.
+Closes: #236086, #274607
+
+Not submitted to XFree86.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/sun/se xc/programs/xkbcomp/symbols/sun/se
+--- xc-old/programs/xkbcomp/symbols/sun/se 2000-05-23 04:47:49.000000000 +0000
++++ xc/programs/xkbcomp/symbols/sun/se 2004-10-06 21:56:32.000000000 +0000
+@@ -93,6 +93,9 @@
+ key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
+ // End "four keys up on the right"
+
++ // Override these settings by default xfree86 Ctrl+Alt combinations
++ include "srvr_ctrl(xfree86)";
++
+ // Begin modifier mappings
+ modifier_map Shift { Shift_R };
+ modifier_map Mod1 { Meta_L, Meta_R };
+@@ -182,6 +185,9 @@
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+ // End "Keypad" section,
+
++ // Override these settings by default xfree86 Ctrl+Alt combinations
++ include "srvr_ctrl(xfree86)";
++
+ // Begin modifier mappings
+ modifier_map Shift { Shift_R };
+ modifier_map Mod1 { Alt_L };
+diff -ruN xc-old/programs/xkbcomp/symbols/sun/us xc/programs/xkbcomp/symbols/sun/us
+--- xc-old/programs/xkbcomp/symbols/sun/us 2004-10-06 21:46:18.000000000 +0000
++++ xc/programs/xkbcomp/symbols/sun/us 2004-10-06 21:56:25.000000000 +0000
+@@ -99,6 +99,9 @@
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+ // End "Keypad" section
+
++ // Override these settings by default xfree86 Ctrl+Alt combinations
++ include "srvr_ctrl(xfree86)";
++
+
+ // begin modifier mappings
+ modifier_map Shift { Shift_R };
+@@ -217,6 +220,9 @@
+ key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] };
+ key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
+
++ // Override these settings by default xfree86 Ctrl+Alt combinations
++ include "srvr_ctrl(xfree86)";
++
+ // begin modifier mappings
+ modifier_map Shift { Shift_R };
+ modifier_map Mod1 { Alt_L };
+@@ -323,6 +329,9 @@
+ key <CUT> { [ SunCut ], [ F20 ] };
+ key <HELP> { [ Help ] };
+
++ // Override these settings by default xfree86 Ctrl+Alt combinations
++ include "srvr_ctrl(xfree86)";
++
+ // begin modifier mappings
+ modifier_map Shift { Shift_R };
+ modifier_map Mod1 { Meta_L, Meta_R };
Reply to: