diff -ur xkbdata-0.99.1.orig/keymap/sgi/bg xkbdata-0.99.1/keymap/sgi/bg --- xkbdata-0.99.1.orig/keymap/sgi/bg 2003-11-14 17:49:22.000000000 +0100 +++ xkbdata-0.99.1/keymap/sgi/bg 2005-11-17 11:35:28.000000000 +0100 @@ -4,7 +4,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "us(pc_universal)+bg+group(shift_toggle)" + include "us(pc_universal)+bg+group(shifts_toggle)" }; xkb_geometry { include "sgi/indy(pc102)" }; }; @@ -13,7 +13,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "us(pc102)+bg+group(shift_toggle)" + include "us(pc102)+bg+group(shifts_toggle)" }; xkb_geometry { include "sgi/indigo(pc102)" }; }; diff -ur xkbdata-0.99.1.orig/keymap/sgi/hu xkbdata-0.99.1/keymap/sgi/hu --- xkbdata-0.99.1.orig/keymap/sgi/hu 2003-11-14 17:49:22.000000000 +0100 +++ xkbdata-0.99.1/keymap/sgi/hu 2005-11-17 11:35:28.000000000 +0100 @@ -20,7 +20,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "en_US(pc_universal)+hu(basic)+group(shift_toggle)" + include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" }; xkb_geometry { include "sgi/indy(pc102)" }; }; @@ -72,7 +72,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "en_US(pc102)+hu(basic)+group(shift_toggle)" + include "en_US(pc102)+hu(basic)+group(shifts_toggle)" }; xkb_geometry { include "sgi/indigo(pc102)" }; }; diff -ur xkbdata-0.99.1.orig/keymap/sgi/ru xkbdata-0.99.1/keymap/sgi/ru --- xkbdata-0.99.1.orig/keymap/sgi/ru 2003-11-14 17:49:22.000000000 +0100 +++ xkbdata-0.99.1/keymap/sgi/ru 2005-11-17 11:35:28.000000000 +0100 @@ -20,7 +20,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "en_US(pc_universal)+ru(basic)+group(shift_toggle)" + include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" }; xkb_geometry { include "sgi/indy(pc102)" }; }; @@ -72,7 +72,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "en_US(pc102)+ru(basic)+group(shift_toggle)" + include "en_US(pc102)+ru(basic)+group(shifts_toggle)" }; xkb_geometry { include "sgi/indigo(pc102)" }; }; diff -ur xkbdata-0.99.1.orig/keymap/sgi/th xkbdata-0.99.1/keymap/sgi/th --- xkbdata-0.99.1.orig/keymap/sgi/th 2003-11-14 17:49:22.000000000 +0100 +++ xkbdata-0.99.1/keymap/sgi/th 2005-11-17 11:35:28.000000000 +0100 @@ -4,7 +4,7 @@ xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "en_US(pc_universal)+th+group(shift_toggle)" + include "en_US(pc_universal)+th+group(shifts_toggle)" }; xkb_geometry { include "sgi/indy(pc102)" }; }; @@ -12,6 +12,6 @@ xkb_keycodes { include "sgi/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc102)+th+group(shift_toggle)" }; + xkb_symbols { include "en_US(pc102)+th+group(shifts_toggle)" }; xkb_geometry { include "sgi/indigo(pc102)" }; }; diff -ur xkbdata-0.99.1.orig/rules/sgi xkbdata-0.99.1/rules/sgi --- xkbdata-0.99.1.orig/rules/sgi 2003-11-14 17:49:22.000000000 +0100 +++ xkbdata-0.99.1/rules/sgi 2005-11-17 11:35:28.000000000 +0100 @@ -3,7 +3,7 @@ ! option = symbols grp:switch = +group(switch) grp:toggle = +group(toggle) - grp:shift_toggle = +group(shift_toggle) + grp:shifts_toggle = +group(shifts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) grp:caps_toggle = +group(caps_toggle) diff -ur xkbdata-0.99.1.orig/rules/sgi.lst xkbdata-0.99.1/rules/sgi.lst --- xkbdata-0.99.1.orig/rules/sgi.lst 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/rules/sgi.lst 2005-11-17 11:35:28.000000000 +0100 @@ -62,7 +62,7 @@ grp Group Shift/Lock behavior grp:switch Right Alt key switches group while held down grp:toggle Pressing Right Alt key toggles group - grp:shift_toggle Pressing both shift keys together toggles group + grp:shifts_toggle Pressing both shift keys together toggles group grp:ctrl_shift_toggle Pressing shift and control together toggles group grp:ctrl_alt_toggle Pressing alt and control together toggles group grp:caps_toggle Caps Lock key toggles group diff -ur xkbdata-0.99.1.orig/rules/sun xkbdata-0.99.1/rules/sun --- xkbdata-0.99.1.orig/rules/sun 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/rules/sun 2005-11-17 11:35:28.000000000 +0100 @@ -29,7 +29,7 @@ ! option = symbols grp:switch = +group(switch) grp:toggle = +group(toggle) - grp:shift_toggle = +group(shift_toggle) + grp:shifts_toggle = +group(shifts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) grp:caps_toggle = +group(caps_toggle) diff -ur xkbdata-0.99.1.orig/rules/sun.lst xkbdata-0.99.1/rules/sun.lst --- xkbdata-0.99.1.orig/rules/sun.lst 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/rules/sun.lst 2005-11-17 11:35:28.000000000 +0100 @@ -46,7 +46,7 @@ grp Group Shift/Lock behavior grp:switch Right Alt key switches group while held down grp:toggle Pressing Right Alt key toggles group - grp:shift_toggle Pressing both shift keys together toggles group + grp:shifts_toggle Pressing both shift keys together toggles group grp:ctrl_shift_toggle Pressing shift and control together toggles group grp:ctrl_alt_toggle Pressing alt and control together toggles group grp:caps_toggle Caps Lock key toggles group diff -ur xkbdata-0.99.1.orig/rules/xfree98 xkbdata-0.99.1/rules/xfree98 --- xkbdata-0.99.1.orig/rules/xfree98 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/rules/xfree98 2005-11-17 11:35:28.000000000 +0100 @@ -19,7 +19,7 @@ ! option = symbols grp:switch = +group(switch) grp:toggle = +group(toggle) - grp:shift_toggle = +group(shift_toggle) + grp:shifts_toggle = +group(shifts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) ctrl:nocaps = +ctrl(nocaps) diff -ur xkbdata-0.99.1.orig/rules/xfree98.lst xkbdata-0.99.1/rules/xfree98.lst --- xkbdata-0.99.1.orig/rules/xfree98.lst 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/rules/xfree98.lst 2005-11-17 11:35:28.000000000 +0100 @@ -19,7 +19,7 @@ grp Group Shift/Lock behavior grp:switch R-Alt switches group while pressed grp:toggle Right Alt key changes group - grp:shift_toggle Both Shift keys together change group + grp:shifts_toggle Both Shift keys together change group grp:ctrl_shift_toggle Control+Shift changes group grp:ctrl_alt_toggle Alt+Control changes group ctrl Control Key Position diff -ur xkbdata-0.99.1.orig/symbols/cz xkbdata-0.99.1/symbols/cz --- xkbdata-0.99.1.orig/symbols/cz 2004-04-23 21:54:52.000000000 +0200 +++ xkbdata-0.99.1/symbols/cz 2005-11-17 11:35:28.000000000 +0100 @@ -12,7 +12,7 @@ // Switching to US added by Jan Holesovsky , 2001 include "us_group2(basic)" - include "group(shift_toggle)" + include "group(shifts_toggle)" name[Group1]= "Czech"; diff -ur xkbdata-0.99.1.orig/symbols/czsk xkbdata-0.99.1/symbols/czsk --- xkbdata-0.99.1.orig/symbols/czsk 2004-08-10 00:37:22.000000000 +0200 +++ xkbdata-0.99.1/symbols/czsk 2005-11-17 11:35:28.000000000 +0100 @@ -159,7 +159,7 @@ partial alphanumeric_keys xkb_symbols "def_basic" { - include "group(shift_toggle)" + include "group(shifts_toggle)" include "srvr_ctrl(xfree86)" // Alphanumeric keys identical to US diff -ur xkbdata-0.99.1.orig/symbols/lt xkbdata-0.99.1/symbols/lt --- xkbdata-0.99.1.orig/symbols/lt 2004-12-04 01:43:16.000000000 +0100 +++ xkbdata-0.99.1/symbols/lt 2005-11-17 11:35:28.000000000 +0100 @@ -4,12 +4,12 @@ // Describes popular Lithuanian keymap 'Baltic' aka querty/numeric // Don't rename this file because it includes 'lt' // Extensions: „ “ instead of 9 0 in Lithuanian mode, endash/Euro on 102nd key -// Usage: setxkbmap -option grp:shift_toggle 'lt' +// Usage: setxkbmap -option grp:shifts_toggle 'lt' // # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr // Option "XkbModel" "pc105" // Option "XkbLayout" "lt+lt(left_switch)" // # Double shift toggles between numbers and Lithuanian letters, you may choose other keys -// Option "XkbOptions" "grp:shift_toggle" +// Option "XkbOptions" "grp:shifts_toggle" partial default alphanumeric_keys modifier_keys xkb_symbols "basic" { diff -ur xkbdata-0.99.1.orig/symbols/sk xkbdata-0.99.1/symbols/sk --- xkbdata-0.99.1.orig/symbols/sk 2004-04-23 21:54:53.000000000 +0200 +++ xkbdata-0.99.1/symbols/sk 2005-11-17 11:35:28.000000000 +0100 @@ -12,7 +12,7 @@ // Switching to US added by Jan Holesovsky , 2001 include "us_group2(basic)" - include "group(shift_toggle)" + include "group(shifts_toggle)" name[Group1] = "Slovak";