libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama

libXmu libfontenc mesa xkeyboard-config

libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a
fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142
glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e
libX11: f57fd760cba92ad846917f21e94e73e9c846185f
libXau: 1a8a1b2c68967b48c07b56142799b1020f017027
libXext: 8eee1236041d46a21faba32e0d27c26985267d89
libXft: c5e760a239afc62a1c75e0509868e35957c8df52
libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc
libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc
mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff
xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4

1 files changed, 62 insertions, 27 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 4705123dc..114ef3a7a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,12 @@
 // 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
-//
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
+   name[Group1]="Multilingual (Canada, Sun Type 6/7)";
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-   name[Group1]="Canada Bilingual";
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [           slash, bar,             backslash                  ]};
    key <AE01> { [               1, exclam,          plusminus                  ]};
@@ -91,7 +71,62 @@ xkb_symbols "type6" {
 
 };
 
-partial alphanumeric_keys
+alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ca(type6)"
+	include "sun_vndr/ca(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ca(fr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-dvorak" {
+	include "ca(fr-dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-legacy" {
+	include "ca(fr-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi" {
+	include "ca(multi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi-2gr" {
+	include "ca(multi-2gr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ike" {
+	include "ca(ike)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multix" {
+	include "ca(multix)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ca(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "eng" {
+	include "ca(eng)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "kut" {
+	include "ca(kut)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "shs" {
+	include "ca(shs)"
 };