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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 62cf63d71..cc6d29e9a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -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
@@ -26,72 +26,44 @@
 // or other dealings in this Software without prior written authorization
 // 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 "sun_type6" {
 
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
+	name[Group1]= "Korean (Sun Type 6/7)";
 
-    // A few keys are different
-    key <ALGR> { [ Hangul                       ]       };
-    key <COMP> { [ Hangul_Hanja                 ]       };
-    key <KANA> { [ Hangul                       ]       };
-    key <EISU> { [ Hangul_Hanja                 ]       };
-    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
+	include "sun_vndr/us(sunbasic)"
 
-        include "level3(ralt_switch)"
+    // A few keys are different
+    key <ALGR> { [ Hangul                       ] };
+    key <COMP> { [ Hangul_Hanja                 ] };
+    key <KANA> { [ Hangul                       ] };
+    key <EISU> { [ Hangul_Hanja                 ] };
+    key <BKSL> { [ backslash, bar,  brokenbar   ] };
 
 };
 
-
-// Korean layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-    key <LNFD> { [ Hangul		]			};
-    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Hangul_Hanja		]			};
-
-	include "level3(ralt_switch)"
-
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/kr(sun_type6)"
 };
 
-// Korean layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar,  brokenbar			] };
-
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "kr106" {
+	include "kr(kr106)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "kr104" {
+	include "kr(kr104)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "koreankeys" {
+	include "kr(koreankeys)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/kr(type6)"
+partial alphanumeric_keys
+	xkb_symbols "koreankeys_raltctl" {
+	include "kr(koreankeys_raltctl)"
 };