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, 19 insertions, 78 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index e5db30e7f..9975486b8 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
@@ -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]="Danish (Sun Type 6/7)";
 
-    name[Group1]="Denmark";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [         onehalf,         section                ] };
     key <AE02> { [               2,        quotedbl,            at ] };
@@ -81,67 +62,27 @@ xkb_symbols "type6" {
 
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-   name[Group1]="Denmark - Sun type 4";
-
-   key <BKSL> { [ onehalf,        section                        ] };
-   key <BRCR> { [ asciitilde,     asciicircum                    ] };
-   key <AE02> { [ 2,              quotedbl,       at             ] };
-   key <AE03> { [ 3,              numbersign,     sterling       ] };
-   key <AE04> { [ 4,              currency,       dollar         ] };
-   key <AE06> { [ 6,              ampersand                      ] };
-   key <AE07> { [ 7,              slash,          braceleft      ] };
-   key <AE08> { [ 8,              parenleft,      bracketleft    ] };
-   key <AE09> { [ 9,              parenright,     bracketright   ] };
-   key <AE10> { [ 0,              equal,          braceright     ] };
-   key <AE11> { [ plus,           question                       ] };
-   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };
-   key <AD03> { [ e,              E,              EuroSign       ] };
-   key <AD11> { [ aring,          Aring                          ] };
-   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };
-   key <LCTL> { [ Caps_Lock                                      ] };
-   key <AC10> { [ ae,             AE                             ] };
-   key <AC11> { [ ooblique,       Ooblique                       ] };
-   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };
-   key <LSGT> { [ less,           greater,         backslash     ] };
-   key <AB08> { [ comma,          semicolon                      ] };
-   key <AB09> { [ period,         colon                          ] };
-   key <AB10> { [ minus,          underscore                     ] };
-   key <CAPS> { [ Control_L                                      ] };
-   key <COMP> { [ SunAltGraph                                    ] };
-   key <ALGR> { [ SunCompose                                     ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
+	xkb_symbols "basic" {
+	include "sun_vndr/dk(sun_type6)"
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type5" {
-
-   include "sun_vndr/dk(type4)"
-
-    name[Group1]="Denmark - Sun type 5";
-
-    key <AE05> { [ 5,           percent,     asciitilde                 ] };
-    key <AE06> { [ 6,           ampersand,   asciicircum                ] };
-    key <AE07> { [ 7,           slash,       braceleft                  ] };
-    key <AE08> { [ 8,           parenleft,   bracketleft                ] };
-    key <AE09> { [ 9,           parenright,  bracketright               ] };
-    key <AE10> { [ 0,           equal,       braceright                 ] };
-    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
-    
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	xkb_symbols "nodeadkeys" {
+	include "dk(nodeadkeys)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "dk(mac)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "dk(mac_nodeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/dk(type6)"
+	xkb_symbols "dvorak" {
+	include "dk(dvorak)"
 };