Merge remote-tracking branch 'origin/released'

* origin/released:
  Switched to xcalc-1.0.5
  Switched to bdftopcf-1.0.4
  libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config

1 files changed, 105 insertions, 26 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index a3850ba5f..f046c3f85 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
@@ -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,31 +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
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="France";
+    name[Group1]="French (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [     twosuperior                              ] };
     key <AE01>	{ [       ampersand,          1                  ] };
@@ -86,11 +67,109 @@ xkb_symbols "type6" {
     key <AB10>	{ [          exclam,    section                  ] };
 
 	include "level3(ralt_switch)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fr(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "fr(olpc)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "fr(Sundeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/fr(type6)"
+	xkb_symbols "sundeadkeys" {
+	include "fr(sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fr(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "fr(oss)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "fr(oss_latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "fr(oss_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "fr(oss_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_nodeadkeys" {
+	include "fr(oss_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9" {
+	include "fr(latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_Sundeadkeys" {
+	include "fr(latin9_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_sundeadkeys" {
+	include "fr(latin9_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_nodeadkeys" {
+	include "fr(latin9_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bepo" {
+	include "fr(bepo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bepo_latin9" {
+	include "fr(bepo_latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "fr(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bre" {
+	include "fr(bre)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oci" {
+	include "fr(oci)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fr(mac)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "fr(geo)"
 };