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, 21 insertions, 65 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 3e0ba2011..8f7a69de0 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -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
-//
-
 default partial alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Dutch (Sun Type 6/7)";
 
-    name[Group1]="Netherlands";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [        at,    section,      notsign ] };
     key <AE01>  { [         1,     exclam,  onesuperior ] };
@@ -95,54 +76,29 @@ xkb_symbols "type6" {
     key <AB10>  { [     minus,      equal ] };
 
         include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Netherlands - Sun type 4";
-
-    key <BKSL> { [ at, section, notsign ]           };
-    key <BRCR> { [ backslash, bar       ]                       };
-    key <AE01> { [ 1, exclam, onesuperior ]       };
-    key <AE02> { [ 2, quotedbl, twosuperior ]       };
-    key <AE03> { [ 3, numbersign, threesuperior]      };
-    key <AE04> { [ 4, dollar, onequarter  ]       };
-    key <AE05> { [ 5, percent, onehalf     ]       };
-    key <AE06> { [ 6, ampersand, threequarters]      };
-    key <AE07> { [ 7, underscore, sterling    ]       };
-    key <AE08> { [ 8, parenleft, braceleft   ]       };
-    key <AE09> { [ 9, parenright, braceright  ]       };
-    key <AE10> { [ 0, quoteright, quoteleft   ]       };
-    key <AE11> { [ slash, question, backslash  ]        };
-    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
-    key <AD03> { [ e, E, EuroSign, Eacute    ]};
-    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
-    key <AD12> { [ asterisk, bar, asciitilde  ]       };
-    key <AC02> { [ S, S, ssharp      ]               };
-    key <AC10> { [ plus, plusminus      ]                       };
-    key <AC11> { [ dead_acute, dead_grave ]                    };
-    key <TLDE> { [ less, greater, asciicircum ]       };
-    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
-    key <AB01> { [ z, Z, guillemotleft]      };
-    key <AB02> { [ x, X, guillemotright]     };
-    key <AB03> { [ c, C, cent        ]       };
-    key <AB07> { [ m, M, Greek_mu, masculine ]       };
-    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
-    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
-    key <AB10> { [ minus, equal, hyphen ]            };
-    key <CAPS> { [ SunAltGraph          ]                       };
-//    key <COMP> { [ SunCompose         ]                       };
-    key <ALGR> { [ Caps_Lock            ]                       }; 
+	xkb_symbols "basic" {
+	include "sun_vndr/nl(sun_type6)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "nl(std)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "nl(Sundeadkeys)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "nl(sundeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/nl(type6)"
+	xkb_symbols "mac" {
+	include "nl(mac)"
 };