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, 31 insertions, 72 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index acd94a2fb..d73ef6e64 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
@@ -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]= "Italian (Sun Type 6/7)";
 
-    name[Group1]="Italy";
+	include "sun_vndr/us(sun_type6)"
 
     key <LSGT> { [            less,         greater                                ] };
     key <TLDE> { [       backslash,             bar                                ] };
@@ -75,66 +56,44 @@ xkb_symbols "type6" {
     key <AB10> { [           minus,      underscore                                ] };
 
         include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Italy - Sun type 4";
- 
-    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };
-    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };
-    key <AE03> { [ 3,            sterling,     threesuperior    ] };
-    key <AE06> { [ 6,            ampersand,    notsign          ] };
-    key <AE06> { [ 7,            slash                          ] };
-    key <AE06> { [ 8,            parenleft                      ] };
-    key <AE09> { [ 9,            parenright,   backslash        ] };
-    key <AE10> { [ 0,            equal,        bar              ] };
-    key <AE11> { [ quoteright,   question,     quoteleft        ] };
-    key <AE12> { [ igrave,       asciicircum                    ] };
- 
-    key <AD11> { [ egrave,       eacute                         ] };
-    key <AD12> { [ plus,         asterisk,     asciitilde       ] };
- 
-    key <AC10> { [ ograve,       ccedilla,     at               ] };
-    key <AC11> { [ agrave,       degree,       numbersign       ] };
-    key <TLDE> { [ ugrave,       section                        ] };
- 
-    key <LSGT> { [ less, greater        ] };
-    key <AB08> { [ comma, semicolon     ] };
-    key <AB09> { [ period, colon        ] };
-    key <AB10> { [ minus, underscore    ] };
-     
- 
-    key <LALT> { [ Alt_L                ] };
-    key <COMP> { [ SunCompose           ] };
-    key <RALT> { [ SunAltGraph          ] };
-    key <LCTL> { [ Caps_Lock            ] };
-    key <CAPS> { [ Control_L            ] };
- 
-	include "level3(ralt_switch)"
+	xkb_symbols "basic" {
+	include "sun_vndr/it(sun_type6)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "it(nodeadkeys)"
 };
 
- 
 partial alphanumeric_keys
-xkb_symbols "type5" {
+	xkb_symbols "mac" {
+	include "it(mac)"
+};
 
-    name[Group1]="Italy - Sun type 5";
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "it(geo)"
+};
 
-    key <AE08> { [ 8,      parenleft,   braceleft                  ] };
-    key <AE09> { [ 9,      parenright,  braceright                 ] };
-    key <BKSL> { [ ugrave, section,     asciitilde                 ] };
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "it(olpc)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "it(us)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "htcdream" {
+	include "it(htcdream)"
 };
- 
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/it(type6)"
+	xkb_symbols "ibm" {
+	include "it(ibm)"
 };