xkeyboard-config/symbols/sun_vndr cs, 1.1, 1.2 cz, 1.1, 1.2 de, 1.1, 1.2 dk, 1.1, 1.2 fr, 1.1, 1.2 gb, 1.1, 1.2 gr, 1.1, 1.2 it, 1.1, 1.2 jp, 1.1, 1.2 ko, 1.1, 1.2 nl, 1.1, 1.2 no, 1.1, 1.2 pl, 1.1, 1.2 ru, 1.1, 1.2 sw, 1.1, 1.2 tr, 1.1, 1.2 tuv, 1.1, 1.2 tw, 1.1, 1.2 us, 1.4, 1.5

"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]> Mon, 17 Dec 2007 12:56:29 -0800 (PST)
Newsgroups gmane.comp.freedesktop.xlibs.cvs
Message-ID <[email protected]>
Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr
In directory kemper:/tmp/cvs-serv17562/symbols/sun_vndr

Modified Files:
	cs cz de dk fr gb gr it jp ko nl no pl ru sw tr tuv tw us 
Log Message:
added sun6 support, b.fd.o#13664

Index: cs
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs	4 Mar 2006 18:10:05 -0000	1.1
+++ cs	17 Dec 2007 20:56:26 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type5" {
-    include "sun/us(type5)"
+    include "sun_vndr/us(type5)"
     include "cz"
 
     // A few keys are different

Index: cz
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/cz,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cz	4 Mar 2006 18:10:05 -0000	1.1
+++ cz	17 Dec 2007 20:56:26 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type5" {
-    include "sun/us(type5)"
+    include "sun_vndr/us(type5)"
     include "cz"
 
     // A few keys are different

Index: de
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/de,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de	4 Mar 2006 18:10:05 -0000	1.1
+++ de	17 Dec 2007 20:56:26 -0000	1.2
@@ -31,7 +31,7 @@
 
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
     key <BKSL> { [ less, braceleft      ]                       };
 

Index: dk
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/dk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dk	4 Mar 2006 18:10:05 -0000	1.1
+++ dk	17 Dec 2007 20:56:26 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
    key <BKSL> { [ onehalf, section	]                       };
    key <BRCR> { [ asciitilde, asciicircum	 ] 		};

Index: fr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr	4 Mar 2006 18:10:05 -0000	1.1
+++ fr	17 Dec 2007 20:56:26 -0000	1.2
@@ -32,7 +32,7 @@
 // French Swiss symbols are in sw
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
 
     key <BKSL> { [ bracketleft, braceleft ]			};
     key <BRCR> { [ bracketright, braceright ]			};
@@ -84,7 +84,7 @@
 };
 
 xkb_symbols "type6" {
-    include "sun/us(type6)"
+    include "sun_vndr/us(type6)"
     include "fr"
 
     key <LSGT> { [ less, greater	]				};

Index: gb
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/gb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gb	4 Mar 2006 18:10:05 -0000	1.1
+++ gb	17 Dec 2007 20:56:26 -0000	1.2
@@ -28,7 +28,7 @@
 // of the copyright holder.
 //
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
     key <AE01> { [ 1, exclam		], [brokenbar	]	};
     key <AE03> { [ 3, sterling		], [numbersign	]	};
@@ -49,5 +49,5 @@
 
 partial
 xkb_symbols "type6" {
-  include "sun/gb(type5)"
+  include "sun_vndr/gb(type5)"
 };

Index: gr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/gr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gr	4 Mar 2006 18:10:05 -0000	1.1
+++ gr	17 Dec 2007 20:56:26 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type5" {
-    include "sun/us(type5basic)"
+    include "sun_vndr/us(type5basic)"
     // A few keys are different
     key <AE04> { [ 4, dollar ], [ EuroSign ] };
     key <AD03> { [ e, E], [ EuroSign ] };

Index: it
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/it,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it	4 Mar 2006 18:10:05 -0000	1.1
+++ it	17 Dec 2007 20:56:26 -0000	1.2
@@ -73,5 +73,5 @@
 
 partial 
 xkb_symbols "type6" {
-    include "sun/it(type5)"
+    include "sun_vndr/it(type5)"
 };

Index: jp
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/jp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jp	4 Mar 2006 18:10:05 -0000	1.1
+++ jp	17 Dec 2007 20:56:26 -0000	1.2
@@ -653,8 +653,8 @@
 };
 
 xkb_symbols "x86" {
-    include "sun/us(pc101)"
-    include "sun/jp(basic)"
+    include "sun_vndr/us(pc101)"
+    include "sun_vndr/jp(basic)"
     key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
 
     key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
@@ -669,7 +669,7 @@
 };
 
 xkb_symbols "J3100" {
-    include "sun/us(pc101)"
+    include "sun_vndr/us(pc101)"
 
     // Alphanumeric section
     key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
@@ -780,7 +780,7 @@
 };
 
 xkb_symbols "Muhenkan_x86" {
-    include "sun/jp(x86)"
+    include "sun_vndr/jp(x86)"
 
     key <EXEC> { [ Muhenkan ] };
 };
@@ -789,7 +789,7 @@
 
 partial
 xkb_symbols "type7" {
-    include "sun/jp(type6)"
+    include "sun_vndr/jp(type6)"
     key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
     key <HZTG> { [ Henkan_Mode ] };
     key <HENK> { [ Kana_Lock, Mode_switch ] };

Index: ko
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/ko,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ko	4 Mar 2006 18:10:05 -0000	1.1
+++ ko	17 Dec 2007 20:56:26 -0000	1.2
@@ -30,7 +30,7 @@
 //
 // Korean layout for a Type 4 Sun keyboard
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
 
     key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
 
@@ -42,7 +42,7 @@
 
 // Korean layout for a Type 5 Sun keyboard
 xkb_symbols "type5" {
-//    include "sun/us(type5basic)"
+//    include "sun_vndr/us(type5basic)"
 
     // A few keys are different
     key <ALGR> { [ Hangul		]				  };
@@ -53,7 +53,7 @@
 // Korean layout for a Type 6 Sun keyboard
 partial
 xkb_symbols "type6" {
-//    include "sun/us(type5basic)"
+//    include "sun_vndr/us(type5basic)"
 
     // A few keys are different
     key <ALGR> { [ Hangul		]				  };

Index: nl
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/nl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl	4 Mar 2006 18:10:05 -0000	1.1
+++ nl	17 Dec 2007 20:56:26 -0000	1.2
@@ -28,7 +28,7 @@
 // of the copyright holder.
 //
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
 
     key <BKSL> { [ at, section		], [notsign ]		};

Index: no
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/no,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- no	4 Mar 2006 18:10:05 -0000	1.1
+++ no	17 Dec 2007 20:56:26 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
 
     key <BKSL> { [ bar, section		]			};

Index: pl
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pl	4 Mar 2006 18:10:05 -0000	1.1
+++ pl	17 Dec 2007 20:56:27 -0000	1.2
@@ -29,7 +29,7 @@
 //
 
 xkb_symbols "type5" {
-    include "sun/us(type5basic)"
+    include "sun_vndr/us(type5basic)"
     // A few keys are different
     key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
     key <AE02> { [ 2, quotedbl		], [ at		]	};

Index: ru
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/ru,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru	4 Mar 2006 18:10:05 -0000	1.1
+++ ru	17 Dec 2007 20:56:27 -0000	1.2
@@ -41,7 +41,7 @@
 // layout for a Sun Type 6 Russian keyboard
 partial
 xkb_symbols "type6" {
-    include "sun/ru(basic)"
+    include "sun_vndr/ru(basic)"
 
     key <AE03> {        [               3,      numbersign      ],
                         [               3,      numerosign      ]       };

Index: sw
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/sw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sw	4 Mar 2006 18:10:05 -0000	1.1
+++ sw	17 Dec 2007 20:56:27 -0000	1.2
@@ -28,7 +28,7 @@
 // of the copyright holder.
 //
 xkb_symbols "type4de" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
     key <BKSL> { [ less, braceleft      ]                       };
 
@@ -66,7 +66,7 @@
 };
 
 xkb_symbols "type4fr" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
     // A few keys are different
     key <BKSL> { [ less, braceleft	]			};
 

Index: tr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/tr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr	4 Mar 2006 18:10:05 -0000	1.1
+++ tr	17 Dec 2007 20:56:27 -0000	1.2
@@ -28,7 +28,7 @@
 // of the copyright holder.
 //
 xkb_symbols "basic" {
-   include "sun/tr(type6Q)"
+   include "sun_vndr/tr(type6Q)"
 };
 
 xkb_symbols "type6Q" {

Index: tuv
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/tuv,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tuv	4 Mar 2006 18:10:05 -0000	1.1
+++ tuv	17 Dec 2007 20:56:27 -0000	1.2
@@ -129,7 +129,7 @@
 };
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
 
     // A few alphanumeric keys are different
     key <AE04> { [ 4, dollar		], [ EuroSign	]	};
@@ -230,7 +230,7 @@
 };
 
 xkb_symbols "type5" {
-    include "sun/us(type5basic)"
+    include "sun_vndr/us(type5basic)"
 
     // A few alphanumeric keys are different
     key <AE04> { [ 4, dollar		], [ EuroSign	]	};

Index: tw
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/tw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tw	4 Mar 2006 18:10:05 -0000	1.1
+++ tw	17 Dec 2007 20:56:27 -0000	1.2
@@ -30,7 +30,7 @@
 //
 // Taiwanese layout for a Type 4 Sun keyboard
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
 
     key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
 

Index: us
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sun_vndr/us,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- us	26 Feb 2006 03:33:08 -0000	1.4
+++ us	17 Dec 2007 20:56:27 -0000	1.5
@@ -76,8 +76,8 @@
     key <FK08> { [ F8			]			};
     key <FK09> { [ F9			]			};
     key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
+    key <FK11> { [ F11			]			};
+    key <FK12> { [ F12			]			};
     key <STOP> { [ L1,	L1		], [ SunStop	]	};
     key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
     key <PROP> { [ L3,	L3		], [ SunProps	]	};
@@ -151,7 +151,7 @@
 
 // US/ASCII layout for a Type 4 Sun keyboard
 xkb_symbols "type4basic" {
-    include "sun/us(sunbasic)"
+    include "sun_vndr/us(sunbasic)"
 
     // A few alphanumeric keys are different
     key <AE04> { [ 4, dollar		], [ EuroSign	]	};
@@ -178,14 +178,14 @@
 };
 
 xkb_symbols "type4" {
-    include "sun/us(type4basic)"
+    include "sun_vndr/us(type4basic)"
 
     key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
 };
 
 // US/ASCII layout for a Type 5 Sun keyboard
 xkb_symbols "type5basic" {
-    include "sun/us(sunbasic)"
+    include "sun_vndr/us(sunbasic)"
 
     // Begin "Editing" section
     key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
@@ -214,15 +214,15 @@
     key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
 
     // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L };
-    modifier_map Mod2           { Alt_R, Mode_switch };
-    modifier_map Mod3           { Num_Lock };
-    modifier_map Mod4           { Meta_L, Meta_R };
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
 };
 
 xkb_symbols "type5" {
-    include "sun/us(type5basic)"
+    include "sun_vndr/us(type5basic)"
 
     // A few alphanumeric keys are different
     key <AE04> { [ 4, dollar		], [ EuroSign	]	};
@@ -232,17 +232,17 @@
 };
 
 xkb_symbols "type6" {
-    include "sun/us(type5)"
+    include "sun_vndr/us(type5)"
 };
 
 
 // US/ASCII layout for a Type 5 Sun keyboard
 xkb_symbols "type5hobobasic" {
-    include "sun/us(type5basic)"
+    include "sun_vndr/us(type5basic)"
 };
 
 xkb_symbols "type5hobo" {
-    include "sun/us(type5hobobasic)"
+    include "sun_vndr/us(type5hobobasic)"
 
     // A few alphanumeric keys are different
     key <AE04> { [ 4, dollar		], [ EuroSign 	]	};