Used synchronise script to update files

1 files changed, 97 insertions, 97 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 6fb72c462..4705123dc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -1,97 +1,97 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-   name[Group1]="Canada Bilingual";

-

-   key <TLDE> { [           slash, bar,             backslash                  ]};

-   key <AE01> { [               1, exclam,          plusminus                  ]};

-   key <AE02> { [               2, at                                          ]};

-   key <AE03> { [               3, numbersign,      sterling                   ]};

-   key <AE04> { [               4, dollar,          cent                       ]};

-   key <AE05> { [               5, percent,         currency                   ]};

-   key <AE06> { [               6, question,        notsign	               ]};

-   key <AE07> { [               7, ampersand,       braceleft                  ]};

-   key <AE08> { [               8, asterisk,        braceright                 ]};

-   key <AE09> { [               9, parenleft,       bracketleft                ]};

-   key <AE10> { [               0, parenright,      bracketright               ]};

-   key <AE11> { [           minus, underscore,      onehalf	               ]};

-   key <AE12> { [           equal, plus,            notsign                    ]};

-  

-   key <AD03> { [               e, E,               EuroSign		       ]};

-   key <AD09> { [               o, O,               section		       ]};

-   key <AD10> { [               p, P,               paragraph                  ]};

-   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};

-   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};

-

-   key <AC10> { [       semicolon, colon,           degree                     ]};

-   key <AC11> { [          egrave, Egrave,          braceleft                  ]};

-   key <AC12> { [          agrave, Agrave,          braceright                 ]};

-   key <BKSL> { [          agrave, Agrave,          braceright                 ]};

-

-   key <LSGT> { [          uacute, Uacute                                      ]};

-   key <AB01> { [               z, Z,               guillemotleft              ]};

-   key <AB02> { [               x, X,               guillemotright             ]};

-   key <AB07> { [               m, M,               mu                         ]};

-   key <AB08> { [           comma, quoteright,      less                       ]};

-   key <AB09> { [          period, quotedbl,        greater                    ]};

-   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};

-   

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ca(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+   name[Group1]="Canada Bilingual";
+
+   key <TLDE> { [           slash, bar,             backslash                  ]};
+   key <AE01> { [               1, exclam,          plusminus                  ]};
+   key <AE02> { [               2, at                                          ]};
+   key <AE03> { [               3, numbersign,      sterling                   ]};
+   key <AE04> { [               4, dollar,          cent                       ]};
+   key <AE05> { [               5, percent,         currency                   ]};
+   key <AE06> { [               6, question,        notsign	               ]};
+   key <AE07> { [               7, ampersand,       braceleft                  ]};
+   key <AE08> { [               8, asterisk,        braceright                 ]};
+   key <AE09> { [               9, parenleft,       bracketleft                ]};
+   key <AE10> { [               0, parenright,      bracketright               ]};
+   key <AE11> { [           minus, underscore,      onehalf	               ]};
+   key <AE12> { [           equal, plus,            notsign                    ]};
+  
+   key <AD03> { [               e, E,               EuroSign		       ]};
+   key <AD09> { [               o, O,               section		       ]};
+   key <AD10> { [               p, P,               paragraph                  ]};
+   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};
+   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};
+
+   key <AC10> { [       semicolon, colon,           degree                     ]};
+   key <AC11> { [          egrave, Egrave,          braceleft                  ]};
+   key <AC12> { [          agrave, Agrave,          braceright                 ]};
+   key <BKSL> { [          agrave, Agrave,          braceright                 ]};
+
+   key <LSGT> { [          uacute, Uacute                                      ]};
+   key <AB01> { [               z, Z,               guillemotleft              ]};
+   key <AB02> { [               x, X,               guillemotright             ]};
+   key <AB07> { [               m, M,               mu                         ]};
+   key <AB08> { [           comma, quoteright,      less                       ]};
+   key <AB09> { [          period, quotedbl,        greater                    ]};
+   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
+   
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ca(type6)"
+};