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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index 8e8bee0f8..b333622d9 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -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,34 +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" {
-
-    name[Group1]="Lithuania";
+xkb_symbols "sun_type6" {
 
+    name[Group1]="Lithuanian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
     key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };
@@ -109,10 +87,39 @@ xkb_symbols "type6" {
     key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
 
 	include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/lt(type6)"
+	include "sun_vndr/lt(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "lt(us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "lt(std)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ibm" {
+	include "lt(ibm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "lekp" {
+	include "lt(lekp)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "lekpa" {
+	include "lt(lekpa)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us_dvorak" {
+	include "lt(us_dvorak)"
 };