Author: barbier
Date: 2004-09-17 18:23:50 -0500 (Fri, 17 Sep 2004)
New Revision: 1824
Removed:
trunk/debian/patches/087_xkb_us_intl_multilayout.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Log:
Merge 087_xkb_us_intl_multilayout.diff into 000_stolen_from_HEAD_xkb_data.diff
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-17 22:53:50 UTC (rev 1823)
+++ trunk/debian/CHANGESETS 2004-09-17 23:23:50 UTC (rev 1824)
@@ -23,7 +23,7 @@
1814
Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
- 1820
+ 1820, 1824
The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
keysyms must be removed from shift level of Alt keys when altwin:meta_win
Modified: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-17
22:53:50 UTC (rev 1823)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-17
23:23:50 UTC (rev 1824)
@@ -172,6 +172,10 @@
xc/programs/xkbcomp/symbols/inet @ 1.33 [PARTIAL]
436. Added support for the Compaq Evo keyboard (Stanislav Brabec).
+xc/programs/xkbcomp/symbols/pc/us_intl @ 1.1
+ 476. Fixes and updates for XKB keyboard maps:
+ - Add multi_layout compliant 'us_intl' keymap (Ivan Pascal).
+
xc/programs/xkbcomp/compat/misc @ 1.5
633. Fixes for XKB keyboard maps:
- fix Meta, Super, Hyper keysyms interpretation
@@ -4757,6 +4761,67 @@
+ key <BKSL> { [ backslash, bar ] };
// End alphanumeric section
};
+Index: xc/programs/xkbcomp/symbols/pc/us_intl
+===================================================================
+RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/us_intl,v
+diff -N us_intl
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ xc/programs/xkbcomp/symbols/pc/us_intl 4 Oct 2003 10:25:14 -0000
1.1
+@@ -0,0 +1,54 @@
++// $XFree86: xc/programs/xkbcomp/symbols/pc/us_intl,v 1.1 2003/10/04 10:25:14
pascal Exp $
++
++// Based on symbols/us_intl keyboard map:
++// Dead-keys definition for a very simple US/ASCII layout.
++// by Conectiva (http://www.conectiva.com.br)
++// modified by Ricardo Y. Igarashi ([EMAIL PROTECTED])
++
++// Added the following deadkeys, to make it truly international:
++//
++// dead_macron: on AltGr-minus
++// dead_breve: on AltGr-parenleft
++// dead_abovedot: on AltGr-period
++// dead_abovering: on AltGr-0
++// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
++// dead_caron: on AltGr-less (AltGr-shift-comma)
++// dead_cedilla: on AltGr-comma
++// dead_ogonek: on AltGr-semicolon
++// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
++// dead_hook: on AltGr-question
++// dead_horn: on AltGr-plus (AltGr-shift-equal)
++// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
++//
++// those were already there:
++// dead_grave
++// dead_acute
++// dead_circumflex
++// dead_tilde
++// dead_diaeresis
++
++partial default alphanumeric_keys
++xkb_symbols "basic" {
++
++ name[Group1]= "US/ASCII";
++ include "pc/us"
++
++ key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
++ key <AE05> { [ 5, percent, EuroSign ] };
++ key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
++ key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
++ key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
++ key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ]
};
++ key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
++
++ key <AD03> { [ e, E, EuroSign, cent
] };
++
++ key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] };
++ key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] };
++
++ key <AB08> { [ comma, less, dead_cedilla, dead_caron ] };
++ key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] };
++ key <AB10> { [ slash, question, dead_hook, dead_hook
] };
++
++ include "level3(ralt_switch_multikey)"
++};
Index: xc/programs/xkbcomp/symbols/pc/yu
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/yu,v
Deleted: trunk/debian/patches/087_xkb_us_intl_multilayout.diff
===================================================================
--- trunk/debian/patches/087_xkb_us_intl_multilayout.diff 2004-09-17
22:53:50 UTC (rev 1823)
+++ trunk/debian/patches/087_xkb_us_intl_multilayout.diff 2004-09-17
23:23:50 UTC (rev 1824)
@@ -1,65 +0,0 @@
-$Id$
-
-This patch by Denis Barbier.
-
-Grab symnols/pc/us_intl layout from XFree86 CVS (2003/10/04).
-Closes: #271326
-
-diff -ruN xc-old/programs/xkbcomp/symbols/pc/us_intl
xc/programs/xkbcomp/symbols/pc/us_intl
---- xc-old/programs/xkbcomp/symbols/pc/us_intl Wed Dec 31 17:00:00 1969
-+++ xc/programs/xkbcomp/symbols/pc/us_intl Fri Sep 17 14:30:16 2004
-@@ -0,0 +1,54 @@
-+// $XFree86: xc/programs/xkbcomp/symbols/pc/us_intl,v 1.1 2003/10/04 10:25:14
pascal Exp $
-+
-+// Based on symbols/us_intl keyboard map:
-+// Dead-keys definition for a very simple US/ASCII layout.
-+// by Conectiva (http://www.conectiva.com.br)
-+// modified by Ricardo Y. Igarashi ([EMAIL PROTECTED])
-+
-+// Added the following deadkeys, to make it truly international:
-+//
-+// dead_macron: on AltGr-minus
-+// dead_breve: on AltGr-parenleft
-+// dead_abovedot: on AltGr-period
-+// dead_abovering: on AltGr-0
-+// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
-+// dead_caron: on AltGr-less (AltGr-shift-comma)
-+// dead_cedilla: on AltGr-comma
-+// dead_ogonek: on AltGr-semicolon
-+// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
-+// dead_hook: on AltGr-question
-+// dead_horn: on AltGr-plus (AltGr-shift-equal)
-+// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
-+//
-+// those were already there:
-+// dead_grave
-+// dead_acute
-+// dead_circumflex
-+// dead_tilde
-+// dead_diaeresis
-+
-+partial default alphanumeric_keys
-+xkb_symbols "basic" {
-+
-+ name[Group1]= "US/ASCII";
-+ include "pc/us"
-+
-+ key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
-+ key <AE05> { [ 5, percent, EuroSign ] };
-+ key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
-+ key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
-+ key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
-+ key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ]
};
-+ key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
-+
-+ key <AD03> { [ e, E, EuroSign, cent
] };
-+
-+ key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] };
-+ key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] };
-+
-+ key <AB08> { [ comma, less, dead_cedilla, dead_caron ] };
-+ key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] };
-+ key <AB10> { [ slash, question, dead_hook, dead_hook
] };
-+
-+ include "level3(ralt_switch_multikey)"
-+};
