From 4adb208f07cbf2f66aa06139d8412156f15ef1cc Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Wed, 19 Apr 2006 21:50:25 +0000
Subject: [PATCH] shift_toggle -> shifts_toggle

---
 ChangeLog          | 5 +++++
 keymap/sgi_vndr/bg | 4 ++--
 keymap/sgi_vndr/hu | 4 ++--
 keymap/sgi_vndr/ru | 4 ++--
 keymap/sgi_vndr/th | 4 ++--
 rules/sgi          | 2 +-
 rules/sun          | 2 +-
 rules/xfree98      | 2 +-
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4be16f..2792326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Sergey Udaltsov
+
+	rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle,
+	fixing https://bugs.freedesktop.org/show_bug.cgi?id=5078
+
 2006-04-08  Sergey Udaltsov
 
 	keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout
diff --git a/keymap/sgi_vndr/bg b/keymap/sgi_vndr/bg
index 4f92573..a3cb08a 100644
--- a/keymap/sgi_vndr/bg
+++ b/keymap/sgi_vndr/bg
@@ -4,7 +4,7 @@ default xkb_keymap "indy" {
     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_vndr/indy(pc102)"	};
 };
@@ -13,7 +13,7 @@ xkb_keymap "indigo" {
     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_vndr/indigo(pc102)"	};
 };
diff --git a/keymap/sgi_vndr/hu b/keymap/sgi_vndr/hu
index 5778dea..3c25684 100644
--- a/keymap/sgi_vndr/hu
+++ b/keymap/sgi_vndr/hu
@@ -20,7 +20,7 @@ xkb_keymap "indy_shift_toggle" {
     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_vndr/indy(pc102)"		};
 };
@@ -72,7 +72,7 @@ xkb_keymap "indigo_shift_toggle" {
     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_vndr/indigo(pc102)"		};
 };
diff --git a/keymap/sgi_vndr/ru b/keymap/sgi_vndr/ru
index 1746ff3..fc514d8 100644
--- a/keymap/sgi_vndr/ru
+++ b/keymap/sgi_vndr/ru
@@ -20,7 +20,7 @@ xkb_keymap "indy_shift_toggle" {
     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_vndr/indy(pc102)"		};
 };
@@ -72,7 +72,7 @@ xkb_keymap "indigo_shift_toggle" {
     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_vndr/indigo(pc102)"		};
 };
diff --git a/keymap/sgi_vndr/th b/keymap/sgi_vndr/th
index 412b5e6..aa03c8c 100644
--- a/keymap/sgi_vndr/th
+++ b/keymap/sgi_vndr/th
@@ -4,7 +4,7 @@ default xkb_keymap "indy" {
     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_vndr/indy(pc102)"	};
 };
@@ -12,6 +12,6 @@ xkb_keymap "indigo" {
     xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"	};
 };
diff --git a/rules/sgi b/rules/sgi
index 657684a..fc72bad 100644
--- a/rules/sgi
+++ b/rules/sgi
@@ -3,7 +3,7 @@
 ! option                =   symbols
   grp:switch            =   +group(switch)
   grp:toggle            =   +group(toggle)
-  grp:shift_toggle      =   +group(shift_toggle)
+  grp:shift_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 --git a/rules/sun b/rules/sun
index dc5b1d3..c40cdfc 100644
--- a/rules/sun
+++ b/rules/sun
@@ -41,7 +41,7 @@
 ! option                =   symbols
   grp:switch            =   +group(switch)
   grp:toggle            =   +group(toggle)
-  grp:shift_toggle      =   +group(shift_toggle)
+  grp:shift_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 --git a/rules/xfree98 b/rules/xfree98
index 8fda643..d6bf7fe 100644
--- a/rules/xfree98
+++ b/rules/xfree98
@@ -19,7 +19,7 @@
 ! option		=	symbols
   grp:switch		=	+group(switch)
   grp:toggle		=	+group(toggle)
-  grp:shift_toggle	=	+group(shift_toggle)
+  grp:shift_toggle	=	+group(shifts_toggle)
   grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
   grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
   ctrl:nocaps		=	+ctrl(nocaps)
-- 
2.32.0.93.g670b81a890