X Strike Force X.Org X11 SVN commit: r1342 - in branches/modular/data/xkbdata-X11R7.0-1.0.1/debian: . patches
Author: dnusinow
Date: 2006-02-26 22:10:52 -0500 (Sun, 26 Feb 2006)
New Revision: 1342
Added:
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/02_xkb_symbols_euro_support.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/03_drop_rules_xorg_duplicates.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/04_czech_include_location.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/05_evdev_xkb.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/06_AB10_minus_underscore.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/08_implement_grp:sclk_toggle.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/09_enable_ca_variants.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/10_ralt_switch_multikey.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/11_uk_macintosh_problems.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/12_implement_compose:caps.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/13_macintosh_problems.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/14_dead_diaresis.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/15_symbols_polish_keypad_separator.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/16_brazilian_keypad_separator.diff
branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/17_tr_fix_eacute.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
+ general/034_evdev_xkb.diff
+ general/081_xkb_fix_AB10_minus_underscore_on_hr.diff
+ general/082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff
+ general/084_xkb_implement_grp:sclk_toggle.diff
+ general/086_enable_ca_variants.diff
+ general/087_xkb_ralt_switch_multikey.diff
+ general/090_xkb_fix_uk_macintosh_problems.diff
+ general/091_xkb_implement_compose:caps.diff
+ general/093_xkb_fix_macintosh_problems.diff
+ general/094_xkb_fix_dead_diaresis.diff
+ general/099g_xkb_symbols_polish_fix_keypad_separator.diff
+ general/099p_xkb_brazilian_fix_keypad_separator.diff
+ general/099s_xkb_tr_fix_eacute.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-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog 2006-02-27 03:10:52 UTC (rev 1342)
@@ -6,8 +6,24 @@
* Rename the package for consistency with xkb-data
* Port patches from trunk
+ general/099l_xkb_cymotion_master_and_ibm_space_saver.diff
+ + general/013a_xkb_symbols_euro_support.diff
+ + general/013_xkb_drop_rules_xorg_duplicates.diff
+ + general/016_czech_include_location.diff
+ + general/034_evdev_xkb.diff
+ + general/081_xkb_fix_AB10_minus_underscore_on_hr.diff
+ + general/082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff
+ + general/084_xkb_implement_grp:sclk_toggle.diff
+ + general/086_enable_ca_variants.diff
+ + general/087_xkb_ralt_switch_multikey.diff
+ + general/090_xkb_fix_uk_macintosh_problems.diff
+ + general/091_xkb_implement_compose:caps.diff
+ + general/093_xkb_fix_macintosh_problems.diff
+ + general/094_xkb_fix_dead_diaresis.diff
+ + general/099g_xkb_symbols_polish_fix_keypad_separator.diff
+ + general/099p_xkb_brazilian_fix_keypad_separator.diff
+ + general/099s_xkb_tr_fix_eacute.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 18:29:11 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 20:21:46 -0500
xkbdata (1.0.1-1) experimental; urgency=low
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/02_xkb_symbols_euro_support.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/02_xkb_symbols_euro_support.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/02_xkb_symbols_euro_support.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,72 @@
+$Id: 013a_xkb_symbols_euro_support.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+This patch by Mike A. Harris.
+
+Not submitted upstream yet.
+
+Index: xc/programs/xkbcomp/symbols/hu
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu 2005-06-26 12:12:46.000000000 +0800
+@@ -246,6 +246,8 @@
+ [ backslash ] };
+ key <AD02> { [ w, W ],
+ [ bar ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ],
+ [ Iacute ] };
+ key <AD12> { [ uacute, Uacute ],
+Index: xc/programs/xkbcomp/symbols/hu_US
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu_US 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu_US 2005-06-26 12:12:46.000000000 +0800
+@@ -44,6 +44,8 @@
+ key <AD02> { [ w, W ],
+ [ bar ] };
+ key <AD06> { [ z, Z ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ],
+ [ Iacute ] };
+ // key <AD11> { [ odoubleacute, Odoubleacute ],
+Index: xc/programs/xkbcomp/symbols/pl
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl 2005-06-26 12:12:46.000000000 +0800
+@@ -25,6 +25,8 @@
+ [ lstroke, Lstroke ] };
+ key <AB06> { [ ],
+ [ nacute, Nacute ] };
++ key <AD07> { [ ],
++ [ EuroSign ] };
+ key <AD09> { [ ],
+ [ oacute, Oacute ] };
+ key <AC02> { [ ],
+Index: xc/programs/xkbcomp/symbols/pl2
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl2 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl2 2005-06-26 12:12:46.000000000 +0800
+@@ -45,7 +45,8 @@
+ key <AD04> { [ r, R ] };
+ key <AD05> { [ t, T ] };
+ key <AD06> { [ z, Z ] };
+- key <AD07> { [ u, U ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ] };
+ key <AD09> { [ o, O ] };
+ key <AD10> { [ p, P ] };
+Index: xc/programs/xkbcomp/symbols/tr
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/tr 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/tr 2005-06-26 12:12:46.000000000 +0800
+@@ -37,6 +37,8 @@
+ key <AE11> { [ asterisk, question ],
+ [ backslash ] };
+ key <AE12> { [ minus, underscore ] };
++ key <AD03> { [ e, E ],
++ [ EuroSign ] };
+ key <AD08> { [ idotless, I ] };
+ key <AD11> { [ gbreve, Gbreve ] };
+ key <AD12> { [ udiaeresis, Udiaeresis ],
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/03_drop_rules_xorg_duplicates.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/03_drop_rules_xorg_duplicates.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/03_drop_rules_xorg_duplicates.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,64 @@
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 20:18:18.000000000 -0500
+@@ -943,59 +943,6 @@
+ eurosign:e = +eurosign(e)
+ eurosign:5 = +eurosign(5)
+ eurosign:2 = +eurosign(2)
+- grp:switch = +group(switch)
+- grp:lswitch = +group(lswitch)
+- grp:win_switch = +group(win_switch)
+- grp:lwin_switch = +group(lwin_switch)
+- grp:rwin_switch = +group(rwin_switch)
+- grp:toggle = +group(toggle)
+- grp:shifts_toggle = +group(shifts_toggle)
+- grp:ctrls_toggle = +group(ctrls_toggle)
+- grp:alts_toggle = +group(alts_toggle)
+- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+- grp:caps_toggle = +group(caps_toggle)
+- grp:shift_caps_toggle = +group(shift_caps_toggle)
+- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+- grp:alt_shift_toggle = +group(alt_shift_toggle)
+- grp:menu_toggle = +group(menu_toggle)
+- grp:lwin_toggle = +group(lwin_toggle)
+- grp:rwin_toggle = +group(rwin_toggle)
+- grp:lshift_toggle = +group(lshift_toggle)
+- grp:rshift_toggle = +group(rshift_toggle)
+- grp:lctrl_toggle = +group(lctrl_toggle)
+- grp:rctrl_toggle = +group(rctrl_toggle)
+- grp:lalt_toggle = +group(lalt_toggle)
+- lv3:switch = +level3(switch)
+- lv3:ralt_switch = +level3(ralt_switch)
+- lv3:lalt_switch = +level3(lalt_switch)
+- lv3:alt_switch = +level3(alt_switch)
+- lv3:menu_switch = +level3(menu_switch)
+- lv3:win_switch = +level3(win_switch)
+- lv3:lwin_switch = +level3(lwin_switch)
+- lv3:rwin_switch = +level3(rwin_switch)
+- caps:capslock = +capslock(capslock)
+- caps:shiftlock = +capslock(shiftlock)
+- caps:grouplock = +capslock(grouplock)
+- ctrl:nocaps = +ctrl(nocaps)
+- ctrl:swapcaps = +ctrl(swapcaps)
+- ctrl:ctrl_ac = +ctrl(ctrl_ac)
+- ctrl:ctrl_aa = +ctrl(ctrl_aa)
+- ctrl:ctrl_ra = +ctrl(ctrl_ra)
+- altwin:menu = +altwin(menu)
+- altwin:meta_alt = +altwin(meta_alt)
+- altwin:meta_win = +altwin(meta_win)
+- altwin:left_meta_win = +altwin(left_meta_win)
+- altwin:super_win = +altwin(super_win)
+- altwin:hyper_win = +altwin(hyper_win)
+- altwin:alt_super_win = +altwin(alt_super_win)
+- compose:ralt = +compose(ralt)
+- compose:rwin = +compose(rwin)
+- compose:menu = +compose(menu)
+- compose:rctrl = +compose(rctrl)
+- srvrkeys:none = +srvr_ctrl(no_srvr_keys)
+- eurosign:e = +eurosign(e)
+- eurosign:5 = +eurosign(5)
+- eurosign:2 = +eurosign(2)
+
+ ! option = compat
+ grp_led:num = +lednum(group_lock)
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/04_czech_include_location.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/04_czech_include_location.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/04_czech_include_location.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,31 @@
+Index: xkbdata-X11R7.0-1.0.1/symbols/pc/cz
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/pc/cz 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/pc/cz 2006-02-26 20:21:39.000000000 -0500
+@@ -78,7 +78,7 @@
+
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "bksl" {
+- include "cz(basic)"
++ include "pc/cz(basic)"
+ name[Group1]= "Czechia - With <\|> key";
+
+ key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
+@@ -91,7 +91,7 @@
+ // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+ // 2001 by Kamil Toman <ktoman@email.cz>
+
+- include "cz(basic)"
++ include "pc/cz(basic)"
+ name[Group1]= "Czechia - qwerty";
+
+ key <AB01> { [ z, Z, degree, NoSymbol ] };
+@@ -100,7 +100,7 @@
+
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "qwerty_bksl" {
+- include "cz(qwerty)"
++ include "pc/cz(qwerty)"
+
+ name[Group1]= "Czechia - qwerty, extended Backslash";
+
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/05_evdev_xkb.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/05_evdev_xkb.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/05_evdev_xkb.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,763 @@
+Index: xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keycodes/Makefile.am 2006-01-26 21:46:49.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am 2006-02-26 21:38:10.000000000 -0500
+@@ -5,6 +5,7 @@
+ aliases \
+ amiga \
+ ataritt \
++ evdev \
+ fujitsu \
+ hp \
+ ibm \
+Index: xkbdata-X11R7.0-1.0.1/keycodes/evdev
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keycodes/evdev 2006-02-26 21:37:54.000000000 -0500
+@@ -0,0 +1,355 @@
++// translation from evdev scancodes to something resembling xfree86 keycodes.
++
++default xkb_keycodes "evdev" {
++ minimum = 8;
++ maximum = 255;
++
++ <TLDE> = 49;
++ <AE01> = 10;
++ <AE02> = 11;
++ <AE03> = 12;
++ <AE04> = 13;
++ <AE05> = 14;
++ <AE06> = 15;
++ <AE07> = 16;
++ <AE08> = 17;
++ <AE09> = 18;
++ <AE10> = 19;
++ <AE11> = 20;
++ <AE12> = 21;
++ <BKSP> = 22;
++
++ <TAB> = 23;
++ <AD01> = 24;
++ <AD02> = 25;
++ <AD03> = 26;
++ <AD04> = 27;
++ <AD05> = 28;
++ <AD06> = 29;
++ <AD07> = 30;
++ <AD08> = 31;
++ <AD09> = 32;
++ <AD10> = 33;
++ <AD11> = 34;
++ <AD12> = 35;
++ <BKSL> = 51;
++ <RTRN> = 36;
++
++ <CAPS> = 66;
++ <AC01> = 38;
++ <AC02> = 39;
++ <AC03> = 40;
++ <AC04> = 41;
++ <AC05> = 42;
++ <AC06> = 43;
++ <AC07> = 44;
++ <AC08> = 45;
++ <AC09> = 46;
++ <AC10> = 47;
++ <AC11> = 48;
++
++ <LFSH> = 50;
++ <AB01> = 52;
++ <AB02> = 53;
++ <AB03> = 54;
++ <AB04> = 55;
++ <AB05> = 56;
++ <AB06> = 57;
++ <AB07> = 58;
++ <AB08> = 59;
++ <AB09> = 60;
++ <AB10> = 61;
++ <RTSH> = 62;
++
++ <LALT> = 64;
++ <LCTL> = 37;
++ <SPCE> = 65;
++ <RCTL> = 105;
++ <RALT> = 108;
++ // Microsoft keyboard extra keys
++ <LWIN> = 133;
++ <RWIN> = 134;
++ <MENU> = 135;
++
++ <ESC> = 9;
++ <FK01> = 67;
++ <FK02> = 68;
++ <FK03> = 69;
++ <FK04> = 70;
++ <FK05> = 71;
++ <FK06> = 72;
++ <FK07> = 73;
++ <FK08> = 74;
++ <FK09> = 75;
++ <FK10> = 76;
++ <FK11> = 95;
++ <FK12> = 96;
++
++ <PRSC> = 107;
++ // <SYRQ> = 107;
++ <SCLK> = 78;
++ <PAUS> = 127;
++ // <BRK> = 419;
++
++ <INS> = 118;
++ <HOME> = 110;
++ <PGUP> = 112;
++ <DELE> = 119;
++ <END> = 115;
++ <PGDN> = 117;
++
++ <UP> = 111;
++ <LEFT> = 113;
++ <DOWN> = 116;
++ <RGHT> = 114;
++
++ <NMLK> = 77;
++ <KPDV> = 106;
++ <KPMU> = 63;
++ <KPSU> = 82;
++
++ <KP7> = 79;
++ <KP8> = 80;
++ <KP9> = 81;
++ <KPAD> = 86;
++
++ <KP4> = 83;
++ <KP5> = 84;
++ <KP6> = 85;
++
++ <KP1> = 87;
++ <KP2> = 88;
++ <KP3> = 89;
++ <KPEN> = 104;
++
++ <KP0> = 90;
++ <KPDL> = 91;
++ // <KPEQ> = 126;
++
++ <FK13> = 191;
++ <FK14> = 192;
++ <FK15> = 193;
++ <FK16> = 194;
++ <FK17> = 195;
++ // <KPDC> = 123;
++
++ // Keys that are generated on Japanese keyboards
++
++ // alias <HZTG> = <TLDE>; // Hankaku_Zenkaku toggle
++ // <HZTG> = 85; // Hankaku/Zenkakau toggle
++ // <HKTG> = 93; // Hiragana/Katakana toggle
++ // <AB11> = 211; // backslash/underscore
++ // <XFER> = 92; // Henkan
++ // <NFER> = 94; // Muhenkan
++ // <AE13> = 124; // Yen
++
++ // Keys that are generated on Korean keyboards
++
++ // alias <HNGL> = <FK16>; // Hangul Latin toggle
++ // alias <HJCV> = <FK17>; // Hangul to Hanja conversion
++ <HNGL> = 130;
++ <HJCV> = 131;
++
++ // Extended keys that may be generated on "Internet" keyboards.
++ // These are not standardised, hence the meaningless names.
++ // The entries commented out are never generated because the raw codes
++ // in those positions are already used for well-defined keys.
++
++ // evdev does standardize names for these though. comment them
++ // all out for now.
++
++ // alias <I01> = <XFER>;
++ // <I02> = 130;
++ // alias <I03> = <NFER>;
++ // <I04> = 132;
++ // alias <I05> = <AE13>;
++ // <I06> = 134;
++ // <I07> = 135;
++ // <I08> = 136;
++ // <I09> = 137;
++ // <I0A> = 138;
++ // <I0B> = 139;
++ // <I0C> = 140;
++ // <I0D> = 141;
++ // <I0E> = 142;
++ // <I0F> = 143;
++ // <I10> = 144;
++ // <I11> = 145;
++ // <I12> = 146;
++ // <I13> = 147;
++ // <I14> = 148;
++ // <I15> = 149;
++ // <I16> = 150;
++ // <I17> = 151;
++ // <I18> = 152;
++ // <I19> = 153;
++ // <I1A> = 154;
++ // <I1B> = 155;
++ // <I1C> = 156; <META>
++ // <I1D> = 157; <K59>
++ // <I1E> = 158;
++ // <I1F> = 159;
++ // <I20> = 160;
++ // <I21> = 161;
++ // <I22> = 162;
++ // <I23> = 163;
++ // <I24> = 164;
++ // <I25> = 165;
++ // <I26> = 166;
++ // <I27> = 167;
++ // <I28> = 168;
++ // <I29> = 169;
++ // <I2A> = 170; <K5A>
++ // <I2B> = 171;
++ // <I2C> = 172;
++ // <I2D> = 173;
++ // <I2E> = 174;
++ // <I2F> = 175;
++ // <I30> = 176;
++ // <I31> = 177;
++ // <I32> = 178;
++ // <I33> = 179;
++ // <I34> = 180;
++ // <I35> = 181; <K5B>
++ // <I36> = 182; <K5D>
++ // <I37> = 183; <K5E>
++ // <I38> = 184; <K5F>
++ // <I39> = 185;
++ // <I3A> = 186;
++ // <I3B> = 187;
++ // <I3C> = 188;
++ // <I3D> = 189; <K62>
++ // <I3E> = 190; <K63>
++ // <I3F> = 191; <K64>
++ // <I40> = 192; <K65>
++ // <I41> = 193; <K66>
++ // <I42> = 194;
++ // <I43> = 195;
++ // <I44> = 196;
++ // <I45> = 197;
++ // <I46> = 198; <K67>
++ // <I47> = 199; <K68>
++ // <I48> = 200; <K69>
++ // <I49> = 201; <K6A>
++ // <I4A> = 202;
++ // <I4B> = 203; <K6B>
++ // <I4C> = 204; <K6C>
++ // <I4D> = 205; <K6D>
++ // <I4E> = 206; <K6E>
++ // <I4F> = 207; <K6F>
++ // <I50> = 208; <K70>
++ // <I51> = 209; <K71>
++ // <I52> = 210; <K72>
++ // <I53> = 211; <K73>
++ // <I54> = 212;
++ // <I55> = 213;
++ // <I56> = 214;
++ // <I57> = 215;
++ // <I58> = 216;
++ // <I59> = 217;
++ // <I5A> = 218;
++ // <I5B> = 219; <K74>
++ // <I5C> = 220; <K75>
++ // <I5D> = 221; <K76>
++ // <I5E> = 222;
++ // <I5F> = 223;
++ // <I60> = 224;
++ // <I61> = 225;
++ // <I62> = 226;
++ // <I63> = 227;
++ // <I64> = 228;
++ // <I65> = 229;
++ // <I66> = 230;
++ // <I67> = 231;
++ // <I68> = 232;
++ // <I69> = 233;
++ // <I6A> = 234;
++ // <I6B> = 235;
++ // <I6C> = 236;
++ // <I6D> = 237;
++ // <I6E> = 238;
++ // <I6F> = 239;
++ // <I70> = 240;
++ // <I71> = 241;
++ // <I72> = 242;
++ // <I73> = 243;
++ // <I74> = 244;
++ // <I75> = 245;
++ // <I76> = 246;
++ // <I77> = 247;
++ // <I78> = 248;
++ // <I79> = 249;
++ // <I7A> = 250;
++ // <I7B> = 251;
++ // <I7C> = 252;
++ // <I7D> = 253;
++ // <I7E> = 254;
++ // <I7F> = 255;
++
++ // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
++ // <K59> = 157; // <I1D>
++ // <K5A> = 170; // <I2A>
++ // <K5B> = 181; // <I35>
++ // alias <K5C> = <KPEQ>;
++ // <K5D> = 182; // <I36>
++ // <K5E> = 183; // <I37>
++ // <K5F> = 184; // <I38>
++ // <K62> = 189; // <I3D>
++ // <K63> = 190; // <I3E>
++ // <K64> = 191; // <I3F>
++ // <K65> = 192; // <I40>
++ // <K66> = 193; // <I41>
++ // <K67> = 198; // <I46>
++ // <K68> = 199; // <I47>
++ // <K69> = 200; // <I48>
++ // <K6A> = 201; // <I49>
++ // <K6B> = 203; // <I4B>
++ // <K6C> = 204; // <I4C>
++ // <K6D> = 205; // <I4D>
++ // <K6E> = 206; // <I4E>
++ // <K6F> = 207; // <I4F>
++ // alias <K70> = <HKTG>; // <I50>
++ // <K71> = 209; // <I51>
++ // <K72> = 210; // <I52>
++ // alias <K73> = <AB11>; // <I53>
++ // <K74> = 219; // <I5B>
++ // <K75> = 220; // <I5C>
++ // <K76> = 221; // <I5D>
++
++ // Solaris compatibility
++
++ // alias <LMTA> = <LWIN>;
++ // alias <RMTA> = <RWIN>;
++ // alias <COMP> = <MENU>;
++ // alias <POWR> = <I0C>;
++ // alias <MUTE> = <I0D>;
++ // alias <VOL-> = <I0E>;
++ // alias <VOL+> = <I0F>;
++ // alias <HELP> = <I10>;
++ // alias <STOP> = <I11>;
++ // alias <AGAI> = <I12>;
++ // alias <PROP> = <I13>;
++ // alias <UNDO> = <I14>;
++ // alias <FRNT> = <I15>;
++ // alias <COPY> = <I16>;
++ // alias <OPEN> = <I17>;
++ // alias <PAST> = <I18>;
++ // alias <FIND> = <I19>;
++ // alias <CUT> = <I1A>;
++
++ // Other codes never generated. The XFree86 ddx never generates
++ // these codes.
++ // Thus we can use them as fake keys
++ // <MDSW> = 93; // <U5D>
++ // <LVL3> = 124; // <U7C>
++ // <ALT> = 125; // <U7D>
++ // <META> = 156; // <I1C>
++ // <SUPR> = 127; // <U7F>
++ // <HYPR> = 128; // <U80>
++
++ indicator 1 = "Caps Lock";
++ indicator 2 = "Num Lock";
++ indicator 3 = "Scroll Lock";
++
++ alias <ALGR> = <RALT>;
++};
+Index: xkbdata-X11R7.0-1.0.1/keymap/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keymap/Makefile.am 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keymap/Makefile.am 2006-02-26 21:39:35.000000000 -0500
+@@ -4,6 +4,7 @@
+ dist_xkbdata_keymap_DATA = \
+ amiga \
+ ataritt \
++ evdev \
+ macintosh \
+ README \
+ sony \
+Index: xkbdata-X11R7.0-1.0.1/keymap/evdev
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keymap/evdev 2006-02-26 21:37:54.000000000 -0500
+@@ -0,0 +1,362 @@
++// $XFree86: xc/programs/xkbcomp/keymap/evdev,v 3.30 2003/04/03 16:34:49 dawes Exp $
++
++
++default xkb_keymap "us" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "us(pc105)" };
++ xkb_geometry { include "pc" };
++};
++
++// "ar" addition by Arabeyes Team, <support@arabeyes.org>
++xkb_keymap "ar" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+ar" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "be" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+be" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "bg" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+bg" };
++ xkb_geometry { include "pc(pc102)" };
++};
++// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
++xkb_keymap "br" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "us(pc101)+br" };
++ xkb_geometry { include "pc(abnt2)" };
++};
++// cz and sk keymaps by Kamil Toman (ktoman@email.cz)
++// are designed to replace old czechoslovakian and czsk keyboards
++// and their prog variants. Those are now obsolete and should not be used anymore.
++xkb_keymap "cz" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+cz" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "cz_qwerty" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+cz_qwerty" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "de" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+de" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "de_CH" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+de_CH" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "dk" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+dk" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "dvorak" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+dvorak" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "en_US" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "es" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+es" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "fr" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+fr" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "fr-latin9" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+fr-latin9" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "fr_CA" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+ca" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "fr_CH" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+fr_CH" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "gb" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+gb" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "hr" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+hr" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "it" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+it" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "jp106" {
++ xkb_keycodes { include "evdev(jp106)" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "jp(jp106)" };
++ xkb_geometry { include "pc(jp106)" };
++};
++xkb_keymap "lt" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+lt" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "lt_std" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+lt_std" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "lv" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+lv" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "mk" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+mk" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "mt" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+mt" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "mt_us" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+mt_us" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "no" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+no" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "pl" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+pl" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "pt" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+pt" };
++ xkb_geometry { include "pc(pc102)" };
++};
++// ro: additions by Cristian Gafton, <gafton@redhat.com>
++xkb_keymap "ro" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc101)+ro(pc101)" };
++ xkb_geometry { include "pc(pc101)" };
++};
++xkb_keymap "ro_microsoft" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+ro(pc105)" };
++ xkb_geometry { include "pc(pc105)" };
++};
++xkb_keymap "ru" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+ru" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "se_FI" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+fi" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "se_SE" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+se" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "sl" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+si" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "sl_SI" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+si" };
++ xkb_geometry { include "pc(pc102)" };
++};
++// cz and sk keymaps by Kamil Toman (ktoman@email.cz)
++// are designed to replace old czechoslovakian and czsk keyboards
++// and their prog variants. Those are now obsolete and should not be used anymore.
++xkb_keymap "sk" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+sk" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "sk_qwerty" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+sk_qwerty" };
++ xkb_geometry { include "pc" };
++};
++// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
++xkb_keymap "syr" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+syr" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "th" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+th" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "th_tis" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+th_tis" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "th_pat" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+th_pat" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "tr" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+tr" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "uk" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+uk)" };
++ xkb_geometry { include "pc(pc102)" };
++};
++xkb_keymap "us_flexpro" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "us(pc105)" };
++ xkb_geometry { include "keytronic(FlexPro)" };
++};
++// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
++// us_intl means standard us keyboard plus dead_keys symbols
++// these keyboards are very popular in Brazil
++xkb_keymap "us_intl" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "us(pc101)+us_intl" };
++ xkb_geometry { include "pc" };
++};
++xkb_keymap "us_microsoft" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "us(pc105)" };
++ xkb_geometry { include "microsoft" };
++};
++
++xkb_keymap "uz" {
++ xkb_keycodes { include "evdev" };
++ xkb_types { include "default" };
++ xkb_compatibility { include "default" };
++ xkb_symbols { include "en_US(pc105)+uz" };
++ xkb_geometry { include "pc(pc102)" };
++};
++
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-02-26 20:18:18.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 21:37:54.000000000 -0500
+@@ -52,6 +52,7 @@
+ pc98 = xfree98(pc98)
+ abnt2 = xfree86(abnt2)
+ jp106 = xfree86(jp106)
++ evdev = evdev
+ * = xfree86
+
+ ! layout[1] = keycodes
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/06_AB10_minus_underscore.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/06_AB10_minus_underscore.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/06_AB10_minus_underscore.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,42 @@
+$Id: 081_xkb_fix_AB10_minus_underscore_on_hr.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+Fix the latin(type3) PC keyboard map to override the AB10 key definition
+inherited from the basic layout, mapping the key to "minus, underscore"
+rather than "slash, question". This enables the al (Albanian), hr
+(Croatian), pl2 (Polish QWERTZ), si (Slovenian), and yu (Yugoslavian)
+layouts to inherit this key mapping (though al overrides it). See Debian
+#236604.
+
+This patch by Branden Robinson; tested by Josip Rodin.
+
+diff -urN xc/programs/xkbcomp/symbols~/pc/latin xc/programs/xkbcomp/symbols/pc/latin
+--- xc/programs/xkbcomp/symbols~/pc/latin 2003-01-25 21:01:48.000000000 -0500
++++ xc/programs/xkbcomp/symbols/pc/latin 2004-03-30 17:08:27.000000000 -0500
+@@ -108,13 +108,14 @@
+ key <AC05> { [ g, G, bracketright, ENG ] };
+ key <AC08> { [ k, K, lstroke, ampersand ] };
+
+- key <AB01> { [ y, Y, guillemotleft, less ] };
++ key <AB01> { [ y, Y, guillemotleft, less ] };
+ key <AB04> { [ v, V, at, grave ] };
+ key <AB05> { [ b, B, braceleft, apostrophe ] };
+ key <AB06> { [ n, N, braceright, braceright ] };
+ key <AB07> { [ m, M, section, masculine ] };
+ key <AB08> { [ comma, semicolon, less, multiply ] };
+ key <AB09> { [ period, colon, greater, division ] };
++ key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] };
+ };
+
+ // Another one Latin common layout
+diff -urN xc/programs/xkbcomp/symbols~/pc/si xc/programs/xkbcomp/symbols/pc/si
+--- xc/programs/xkbcomp/symbols~/pc/si 2003-02-04 20:38:36.000000000 -0500
++++ xc/programs/xkbcomp/symbols/pc/si 2004-03-30 17:08:27.000000000 -0500
+@@ -33,8 +33,6 @@
+ key <AC10> { [ ccaron, Ccaron, dead_acute, dead_doubleacute ] };
+ key <AC11> { [ cacute, Cacute, ssharp, dead_caron ] };
+
+- key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] };
+-
+ key <TLDE> { [dead_cedilla, dead_diaeresis, notsign, notsign ] };
+
+ key <BKSL> { [ zcaron, Zcaron, currency, dead_breve ] };
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,22 @@
+$Id: 082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+German keyboards using the "nodeadkeys" variant should produce an
+apostrophe, not an acute accent, when <AE12> is pressed. This change is
+also consistent with the existing xc/programs/xkbcomp/symbols/de file.
+See Debian bug #241127.
+
+This patch by Andreas Metzler.
+
+Index: xc/programs/xkbcomp/symbols/pc/de
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/de.orig 2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/de 2005-10-18 21:32:56.000000000 -0400
+@@ -42,7 +42,7 @@
+ name[Group1]="Germany - Eliminate dead keys";
+
+ key <TLDE> { [asciicircum, degree, notsign, notsign ] };
+- key <AE12> { [ acute, grave, cedilla, cedilla ] };
++ key <AE12> { [apostrophe, grave, cedilla, cedilla ] };
+ key <AD11> { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] };
+ key <AD12> { [ plus, asterisk, asciitilde, macron ] };
+ key <AC10> { [odiaeresis, Odiaeresis, doubleacute, doubleacute ] };
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/08_implement_grp:sclk_toggle.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/08_implement_grp:sclk_toggle.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/08_implement_grp:sclk_toggle.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,75 @@
+$Id: 084_xkb_implement_grp:sclk_toggle.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Provide XKB configuration option for Scroll Lock to be used as a group
+toggle key.
+
+This patch by Michal Kaspar.
+
+Not submitted upstream.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-02-26 21:37:54.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 21:51:14.000000000 -0500
+@@ -908,6 +908,7 @@
+ grp:menu_toggle = +group(menu_toggle)
+ grp:lwin_toggle = +group(lwin_toggle)
+ grp:rwin_toggle = +group(rwin_toggle)
++ grp:sclk_toggle = +group(sclk_toggle)
+ grp:lshift_toggle = +group(lshift_toggle)
+ grp:rshift_toggle = +group(rshift_toggle)
+ grp:lctrl_toggle = +group(lctrl_toggle)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst 2006-02-26 21:51:14.000000000 -0500
+@@ -357,6 +357,7 @@
+ grp:menu_toggle Menu key changes group.
+ grp:lwin_toggle Left Win-key changes group.
+ grp:rwin_toggle Right Win-key changes group.
++ grp:sclk_toggle Scroll Lock changes group
+ grp:lshift_toggle Left Shift key changes group.
+ grp:rshift_toggle Right Shift key changes group.
+ grp:lctrl_toggle Left Ctrl key changes group.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml 2006-02-26 20:17:40.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml 2006-02-26 21:51:14.000000000 -0500
+@@ -7191,6 +7191,14 @@
+ </option>
+ <option>
+ <configItem>
++ <name>grp:sclk_toggle</name>
++ <description>Scroll Lock changes group</description>
++ <description xml:lang="bg">Scroll Lock сменя групата</description>
++ <description xml:lang="ru">Scroll Lock меняет группу</description>
++ </configItem>
++ </option>
++ <option>
++ <configItem>
+ <name>grp:lshift_toggle</name>
+ <description>Left Shift key changes group.</description>
+ <description xml:lang="en_GB">Left Shift key changes group.</description>
+Index: xkbdata-X11R7.0-1.0.1/symbols/group
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/group 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/group 2006-02-26 21:51:14.000000000 -0500
+@@ -215,6 +215,18 @@
+ };
+ };
+
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++ virtual_modifiers AltGr;
++ key <SCLK> {
++ virtualMods= AltGr,
++ symbols[Group1] = [ ISO_Next_Group ]
++ };
++};
++
++
+ // Both Ctrls pressed together toggle group
+ partial modifier_keys
+ xkb_symbols "ctrls_toggle" {
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/09_enable_ca_variants.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/09_enable_ca_variants.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/09_enable_ca_variants.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,16 @@
+Remove these definitions because they take precedence over variants
+which can then not be selected. (closes: #347496)
+
+Index: xc/programs/xkbcomp/rules/xorg
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.orig 2006-02-05 21:59:24.000000000 -0500
++++ xc/programs/xkbcomp/rules/xorg 2006-02-05 21:59:26.000000000 -0500
+@@ -314,8 +314,6 @@
+ $pcmodels intl = us(%mcompose)
+ * intl = us(pc104compose)
+ * jp = pc/pc(pc102)+pc/jp(latin)+pc/jp:2
+- $pcmodels ca = pc/pc(%m)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
+- * ca = pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
+ $pcmodels $nonlatin = pc/pc(%m)+pc/us+pc/%l%(v):2
+ $pcmodels * = pc/pc(%m)+pc/%l%(v)
+ * $nonlatin = pc/pc(pc105)+pc/us+pc/%l%(v):2
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/10_ralt_switch_multikey.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/10_ralt_switch_multikey.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/10_ralt_switch_multikey.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,63 @@
+The lv3:ralt_switch_multikey option was available in previous releases
+and has even been the default, so keep it.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-02-26 21:53:38.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 21:55:08.000000000 -0500
+@@ -915,6 +915,7 @@
+ lv3:switch = +level3(switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:lalt_switch = +level3(lalt_switch)
++ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
+ lv3:alt_switch = +level3(alt_switch)
+ lv3:menu_switch = +level3(menu_switch)
+ lv3:win_switch = +level3(win_switch)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst 2006-02-26 21:51:14.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst 2006-02-26 21:55:08.000000000 -0500
+@@ -371,6 +371,7 @@
+ lv3:alt_switch Press any of Alt keys to choose 3rd level.
+ lv3:lalt_switch Press Left Alt key to choose 3rd level.
+ lv3:ralt_switch Press Right Alt key to choose 3rd level.
++ lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key
+ ctrl Control key position
+ ctrl:nocaps Make CapsLock an additional Control.
+ ctrl:swapcaps Swap Control and CapsLock.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml 2006-02-26 21:51:14.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml 2006-02-26 21:55:08.000000000 -0500
+@@ -7356,6 +7356,12 @@
+ <description xml:lang="vi">Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3.</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>lv3:ralt_switch_multikey</name>
++ <description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key</description>
++ </configItem>
++ </option>
+ </group>
+ <group allowMultipleSelection="false">
+ <!-- Tweaking the position of the "Ctrl" key -->
+Index: xkbdata-X11R7.0-1.0.1/symbols/level3
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/level3 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/level3 2006-02-26 21:55:08.000000000 -0500
+@@ -18,6 +18,14 @@
+ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
++partial modifier_keys
++xkb_symbols "ralt_switch_multikey" {
++ key <RALT> {
++ type[Group1]="TWO_LEVEL",
++ symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
++ };
++};
++
+ // using the level(alt_switch) map, either Alt key temporarily chooses
+ // the third shift level. (Mostly be used to imitate Mac OS functionality.)
+ partial modifier_keys
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/11_uk_macintosh_problems.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/11_uk_macintosh_problems.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/11_uk_macintosh_problems.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,50 @@
+$Id: 090_xkb_fix_uk_macintosh_problems.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+Fix a few problems with the U.K. Macintosh keyboard layout:
+ * Map <TLDE> key to "section, plusminus".
+ * Map <LSGT> key to "quoteleft, asciitilde".
+ * Map AltGr+<AE02> to "EuroSign".
+ * Include group(switch) symbols so that the already-defined mapping
+ of AltGr+<AE03) to "numbersign" can be used.
+
+Also see Debian #201737.
+
+This patch by Branden Robinson. Thanks to Mark Brown, Frank Murphy, and
+Sebastien Bacher for their assistance.
+
+Not submitted to XFree86.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/macintosh/gb xc/programs/xkbcomp/symbols/macintosh/gb
+--- xc-old/programs/xkbcomp/symbols/macintosh/gb 2004-04-23 19:54:54.000000000 +0000
++++ xc/programs/xkbcomp/symbols/macintosh/gb 2004-10-26 11:40:11.728581296 +0000
+@@ -1,19 +1,20 @@
+ // $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $
+ // $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.3 1996/12/23 07:13:25 dawes Exp $
+-partial default alphanumeric_keys
+-xkb_symbols "basic" {
+
+- // Describes the differences between a very simple en_US
+- // keyboard and a very simple U.K. keyboard layout
++partial default alphanumeric_keys
++xkb_symbols "basic" {
+
++ // Describe the differences between a U.S. Extended Macintosh keyboard
++ // and a U.K. Extended Macintosh keyboard.
+
+- name[Group1]= "Great Britain";
++ name[Group1]="Great Britain";
+
+- key <AE03> { [ 3, sterling ],
++ key <TLDE> { [ section, plusminus ] };
++ key <AE02> { [],
++ [ EuroSign ] };
++ key <AE03> { [ 3, sterling ],
+ [ numbersign ] };
++ key <LSGT> { [ quoteleft, asciitilde ] };
+
+- // End alphanumeric section
+-
++ include "group(switch)"
+ };
+-
+-
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/12_implement_compose:caps.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/12_implement_compose:caps.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/12_implement_compose:caps.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,65 @@
+$Id: 091_xkb_implement_compose:caps.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Implement option to place Compose key ("Multi_key") on <CAPS> key. See
+Debian #251310 #345796
+
+This patch by Andrew Suffield and Branden Robinson.
+
+Not submitted to XFree86.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg 2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg 2006-02-26 21:58:03.000000000 -0500
+@@ -940,6 +940,7 @@
+ compose:rwin = +compose(rwin)
+ compose:menu = +compose(menu)
+ compose:rctrl = +compose(rctrl)
++ compose:caps = +compose(caps)
+ srvrkeys:none = +srvr_ctrl(no_srvr_keys)
+ eurosign:e = +eurosign(e)
+ eurosign:5 = +eurosign(5)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst 2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst 2006-02-26 21:58:03.000000000 -0500
+@@ -403,6 +403,7 @@
+ compose:rwin Right Win-key is Compose.
+ compose:menu Menu is Compose.
+ compose:rctrl Right Ctrl is Compose.
++ compose:caps Caps Lock is Compose
+ compat Miscellaneous compatibility options
+ numpad:microsoft Shift with numpad keys works as in MS Windows.
+ srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml 2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml 2006-02-26 21:58:03.000000000 -0500
+@@ -7934,6 +7934,14 @@
+ <description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím 2.</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>compose:caps</name>
++ <description>Caps Lock is Compose</description>
++ <description xml:lang="bg">Клавиша Caps Lock фунцкионира като Compose</description>
++ <description xml:lang="ru">Клавиша Caps Lock соответствует клавише Compose</description>
++ </configItem>
++ </option>
+ </group>
+ </optionList>
+ </xkbConfigRegistry>
+Index: xkbdata-X11R7.0-1.0.1/symbols/compose
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/compose 2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/compose 2006-02-26 21:58:03.000000000 -0500
+@@ -22,3 +22,8 @@
+ xkb_symbols "rctrl" {
+ key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+ };
++
++partial modifier_keys
++xkb_symbols "caps" {
++ key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
++};
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/13_macintosh_problems.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/13_macintosh_problems.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/13_macintosh_problems.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,22 @@
+$Id: 093_xkb_fix_macintosh_problems.diff 480 2005-08-02 20:14:26Z branden $
+
+Fix miscellaneous Macintosh XKB data problems:
+* The keypad equal key (<KPEQ>) should map to the "KP_Equal" keysym, not
+ "equal".
+
+This patch by Branden Robinson.
+
+Not submitted to X.Org.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/macintosh/us xc/programs/xkbcomp/symbols/macintosh/us
+--- xc-old/programs/xkbcomp/symbols/macintosh/us 2005-05-08 23:28:52.000000000 -0400
++++ xc/programs/xkbcomp/symbols/macintosh/us 2005-07-02 14:59:09.000000000 -0400
+@@ -101,7 +101,7 @@
+
+ // Begin "Keypad" section
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+- key <KPEQ> { [ equal ] };
++ key <KPEQ> { [ KP_Equal ] };
+ key <KPDV> { [ KP_Divide ] };
+ key <KPMU> { [ KP_Multiply ] };
+
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/14_dead_diaresis.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/14_dead_diaresis.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/14_dead_diaresis.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,21 @@
+$Id: 094_xkb_fix_dead_diaresis.diff 1027 2006-01-06 23:19:46Z barbier $
+
+Fix unknown keysym.
+
+This patch by Denis Barbier.
+
+Not submitted upstream to X.Org.
+
+Index: xorg-x11/xc/programs/xkbcomp/symbols/pc/de
+===================================================================
+--- xorg-x11.orig/xc/programs/xkbcomp/symbols/pc/de 2006-01-06 23:06:44.000000000 +0100
++++ xorg-x11/xc/programs/xkbcomp/symbols/pc/de 2006-01-06 23:11:32.000000000 +0100
+@@ -140,7 +140,7 @@
+ key <AE12> { [ less, greater, dead_grave ] };
+
+ key <AD01> { [ udiaeresis, Udiaeresis, at ] };
+- key <AD02> { [ comma, semicolon, dead_diaresis ] };
++ key <AD02> { [ comma, semicolon, dead_diaeresis ] };
+ key <AD03> { [ period, colon ] };
+ key <AD08> { [ c, C, copyright, Cacute ] };
+ key <AD09> { [ t, T, trademark ] };
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/15_symbols_polish_keypad_separator.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/15_symbols_polish_keypad_separator.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/15_symbols_polish_keypad_separator.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,55 @@
+$Id: 099g_xkb_symbols_polish_fix_keypad_separator.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+This patch by Branden Robinson, based on a report from Emil Novak.
+
+Not submitted to XFree86.
+
+Index: xc/programs/xkbcomp/symbols/pc/pl
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/pl.orig 2005-10-19 17:35:50.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/pl 2005-10-19 17:57:15.000000000 -0400
+@@ -24,6 +24,10 @@
+
+ include "keypad(comma)"
+
++ // Begin keypad section
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
++ // End of keypad section
++
+ include "level3(ralt_switch)"
+ };
+
+Index: xc/programs/xkbcomp/symbols/pl
+===================================================================
+--- xc/programs/xkbcomp/symbols/pl.orig 2005-10-19 17:51:55.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl 2005-10-19 17:57:15.000000000 -0400
+@@ -37,8 +37,12 @@
+ [ zabovedot, Zabovedot ] };
+ // End alphanumeric section
+
+- // Begin mofifier mappings
+-
++ // Begin keypad section
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
++ // End of keypad section
++
++ // Begin modifier mappings
++
+ modifier_map Shift { Shift_L };
+ modifier_map Lock { Caps_Lock };
+ modifier_map Control{ Control_L };
+Index: xc/programs/xkbcomp/symbols/pl2
+===================================================================
+--- xc/programs/xkbcomp/symbols/pl2.orig 2005-10-19 17:51:55.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl2 2005-10-19 17:57:15.000000000 -0400
+@@ -95,6 +95,10 @@
+
+ // End alphanumeric section
+
++ // Begin keypad section
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
++ // End of keypad section
++
+ // begin modifier mappings
+ modifier_map Shift { Shift_L };
+ modifier_map Lock { Caps_Lock };
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/16_brazilian_keypad_separator.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/16_brazilian_keypad_separator.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/16_brazilian_keypad_separator.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,32 @@
+$Id: 099p_xkb_brazilian_fix_keypad_separator.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+This patch by Denis Barbier, based on a report from Rafael Ávila de
+Espíndola.
+
+Not submitted to XFree86.
+
+Index: xc/programs/xkbcomp/symbols/br
+===================================================================
+--- xc/programs/xkbcomp/symbols/br.orig 2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/br 2005-10-18 22:10:11.000000000 -0400
+@@ -61,7 +61,7 @@
+ [ degree, questiondown ] };
+
+ key <KPPT> { [ KP_Decimal ] };
+- key <KPDL> { [ KP_Delete, comma ] };
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
+
+ // begin modifier mappings
+
+Index: xc/programs/xkbcomp/symbols/pc/br
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/br.orig 2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/br 2005-10-18 22:10:33.000000000 -0400
+@@ -42,6 +42,7 @@
+ key <AB11> { [ slash, question, degree, questiondown ] };
+
+ key <KPPT> { [ KP_Decimal ] };
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
+
+ include "keypad(comma)"
+
Added: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/17_tr_fix_eacute.diff
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/17_tr_fix_eacute.diff 2006-02-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/17_tr_fix_eacute.diff 2006-02-27 03:10:52 UTC (rev 1342)
@@ -0,0 +1,15 @@
+$Id: 099q_xkb_tr_fix_eacute.diff 189 2005-06-11 00:04:27Z branden $
+
+Index: xc/programs/xkbcomp/symbols/pc/tr
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/tr.orig 2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/tr 2005-10-18 22:13:13.000000000 -0400
+@@ -49,7 +49,7 @@
+ key <AC10> { [ scedilla, Scedilla, acute, dead_acute ] };
+ key <AC11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+ [ i, Iabovedot, apostrophe, dead_caron ] };
+- key <TLDE> { [ quotedbl, backslash, plusminus, degree ] };
++ key <TLDE> { [ quotedbl, eacute, plusminus, degree ] };
+
+ key <BKSL> { [ comma, semicolon, grave, dead_grave ] };
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
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-27 02:32:20 UTC (rev 1341)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/patches/series 2006-02-27 03:10:52 UTC (rev 1342)
@@ -1 +1,17 @@
01_cymotion_master_and_ibm_space_saver.diff
+02_xkb_symbols_euro_support.diff -p3
+03_drop_rules_xorg_duplicates.diff
+04_czech_include_location.diff
+05_evdev_xkb.diff
+06_AB10_minus_underscore.diff -p3
+07_AE12_apostrophe_on_pc_de_nodeadkeys.diff -p3
+08_implement_grp:sclk_toggle.diff
+09_enable_ca_variants.diff -p3
+10_ralt_switch_multikey.diff
+11_uk_macintosh_problems.diff -p3
+12_implement_compose:caps.diff
+13_macintosh_problems.diff -p3
+14_dead_diaresis.diff -p4
+15_symbols_polish_keypad_separator.diff -p3
+16_brazilian_keypad_separator.diff -p3
+17_tr_fix_eacute.diff -p3
Reply to: