Author: dnusinow
Date: 2006-02-28 21:50:40 -0500 (Tue, 28 Feb 2006)
New Revision: 1356
Added:
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/18_riscpc_keycodes.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/19_sun_loads_srvr_ctrl.diff
Modified:
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/series
Log:
* Port patches from trunk
+ arm/300_riscpc_xkb_keycodes.diff
+ sparc/101b_xkb_sun_loads_srvr_ctrl.diff
Modified: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
2006-02-28 03:45:08 UTC (rev 1355)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
2006-03-01 02:50:40 UTC (rev 1356)
@@ -22,8 +22,10 @@
+ general/099g_xkb_symbols_polish_fix_keypad_separator.diff
+ general/099p_xkb_brazilian_fix_keypad_separator.diff
+ general/099s_xkb_tr_fix_eacute.diff
+ + arm/300_riscpc_xkb_keycodes.diff
+ + sparc/101b_xkb_sun_loads_srvr_ctrl.diff
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 20:21:46 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 28 Feb 2006 21:44:37 -0500
xkbdata (1.0.1-1) experimental; urgency=low
Added:
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/18_riscpc_keycodes.diff
===================================================================
---
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/18_riscpc_keycodes.diff
2006-02-28 03:45:08 UTC (rev 1355)
+++
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/18_riscpc_keycodes.diff
2006-03-01 02:50:40 UTC (rev 1356)
@@ -0,0 +1,155 @@
+$Id: 300_riscpc_xkb_keycodes.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Add support for RiscPC keycodes. See Debian #141392.
+
+This patch by Phil Blundell.
+
+Not submitted to XFree86 upstream.
+
+Index: xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keycodes/Makefile.am 2006-02-28
21:02:18.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am 2006-02-28 21:10:50.000000000
-0500
+@@ -12,6 +12,7 @@
+ macintosh \
+ powerpcps2 \
+ README \
++ riscpc \
+ sony \
+ sun \
+ xfree86 \
+Index: xkbdata-X11R7.0-1.0.1/keycodes/riscpc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keycodes/riscpc 2006-02-28 21:10:15.000000000
-0500
+@@ -0,0 +1,130 @@
++// XFree86 codes for RiscPC
++
++default xkb_keycodes "xfree86" {
++ minimum = 8;
++ maximum = 127;
++
++ <TLDE> = 24;
++ <AE01> = 25;
++ <AE02> = 26;
++ <AE03> = 27;
++ <AE04> = 28;
++ <AE05> = 29;
++ <AE06> = 30;
++ <AE07> = 31;
++ <AE08> = 32;
++ <AE09> = 33;
++ <AE10> = 34;
++ <AE11> = 35;
++ <AE12> = 36;
++ <BKSP> = 38;
++
++ <TAB> = 46;
++ <AD01> = 47;
++ <AD02> = 48;
++ <AD03> = 49;
++ <AD04> = 50;
++ <AD05> = 51;
++ <AD06> = 52;
++ <AD07> = 53;
++ <AD08> = 54;
++ <AD09> = 55;
++ <AD10> = 56;
++ <AD11> = 57;
++ <AD12> = 58;
++ <RTRN> = 79;
++
++ <CAPS> = 101;
++ <AC01> = 68;
++ <AC02> = 69;
++ <AC03> = 70;
++ <AC04> = 71;
++ <AC05> = 72;
++ <AC06> = 73;
++ <AC07> = 74;
++ <AC08> = 75;
++ <AC09> = 76;
++ <AC10> = 77;
++ <AC11> = 78;
++
++ <LFSH> = 84;
++ <BKSL> = 37;
++ <LSGT> = 59;
++ <AB01> = 86;
++ <AB02> = 87;
++ <AB03> = 88;
++ <AB04> = 89;
++ <AB05> = 90;
++ <AB06> = 91;
++ <AB07> = 92;
++ <AB08> = 93;
++ <AB09> = 94;
++ <AB10> = 95;
++ <RTSH> = 96;
++
++ <LALT> = 102;
++ <LCTL> = 67;
++ <SPCE> = 103;
++ //<RCTL> = 54;
++ <RALT> = 127;
++
++ <PRSC> = 21;
++ //<SYRQ> = 22;
++ <SCLK> = 22;
++ //<PAUS> = 31;
++ <BRK> = 23;
++
++ <INS> = 39;
++ <HOME> = 40;
++ <PGUP> = 41;
++ <DELE> = 60;
++ <END> = 61;
++ <PGDN> = 62;
++
++ <UP> = 97;
++ <LEFT> = 106;
++ <DOWN> = 107;
++ <RGHT> = 108;
++
++ <NMLK> = 42;
++ <KPDV> = 43;
++ <KPMU> = 44;
++ <KPSU> = 45;
++
++ <KP7> = 63;
++ <KP8> = 64;
++ <KP9> = 65;
++ <KPAD> = 83;
++
++ <KP4> = 80;
++ <KP5> = 81;
++ <KP6> = 82;
++
++ <KP1> = 98;
++ <KP2> = 99;
++ <KP3> = 100;
++ <KPEN> = 111;
++
++ <KP0> = 109;
++ <KPDL> = 110;
++
++ <ESC> = 8;
++ <FK01> = 9;
++ <FK02> = 10;
++ <FK03> = 11;
++ <FK04> = 12;
++ <FK05> = 13;
++ <FK06> = 14;
++ <FK07> = 15;
++ <FK08> = 16;
++ <FK09> = 17;
++ <FK10> = 18;
++ <FK11> = 19;
++ <FK12> = 20;
++
++ indicator 1 = "Caps Lock";
++ indicator 2 = "Num Lock";
++ indicator 3 = "Scroll Lock";
++
++ alias <ALGR> = <RALT>;
++};
Added:
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/19_sun_loads_srvr_ctrl.diff
===================================================================
---
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/19_sun_loads_srvr_ctrl.diff
2006-02-28 03:45:08 UTC (rev 1355)
+++
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/19_sun_loads_srvr_ctrl.diff
2006-03-01 02:50:40 UTC (rev 1356)
@@ -0,0 +1,65 @@
+$Id: 101b_xkb_sun_loads_srvr_ctrl.diff 395 2005-07-22 21:34:44Z dnusinow $
+
+This patch by Denis Barbier
+
+Add support for standard Ctrl+Alt sequences to Sun keyboards.
+Closes: #236086, #274607, #286268
+
+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 2004-04-23 19:54:56.000000000
+0000
++++ xc/programs/xkbcomp/symbols/sun/se 2004-10-27 05:00:16.426625176 +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-04-23 19:54:56.000000000
+0000
++++ xc/programs/xkbcomp/symbols/sun/us 2004-10-27 05:00:16.427625024 +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 };
Modified: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/series
2006-02-28 03:45:08 UTC (rev 1355)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/series
2006-03-01 02:50:40 UTC (rev 1356)
@@ -15,3 +15,5 @@
15_symbols_polish_keypad_separator.diff -p3
16_brazilian_keypad_separator.diff -p3
17_tr_fix_eacute.diff -p3
+18_riscpc_keycodes.diff
+19_sun_loads_srvr_ctrl.diff -p3
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
