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, 67 insertions, 28 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 18ff4f0b1..b926349ab 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
@@ -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 partial alphanumeric_keys
+xkb_symbols "sun_type6" {
 
+    name[Group1]="Turkish (Sun Type 6)";
 
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Turkey - (Q)";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [  quotedbl,     eacute                ] };
     key <AE01>	{ [         1,     exclam                ] };
@@ -83,10 +63,69 @@ xkb_symbols "type6" {
     key <AB10>	{ [    period,      colon               ] };
 
 	include "level3(ralt_switch)"
-
 };
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
         xkb_symbols "basic" {
-        include "sun_vndr/tr(type6)"
+        include "sun_vndr/tr(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "f" {
+	include "tr(f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "alt" {
+	include "tr(alt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "tr(Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "tr(sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku" {
+	include "tr(ku)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku_f" {
+	include "tr(ku_f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku_alt" {
+	include "tr(ku_alt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "tr(intl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "tr(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh" {
+	include "tr(crh)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh_f" {
+	include "tr(crh_f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh_alt" {
+	include "tr(crh_alt)"
 };