libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama

libXmu libfontenc mesa xkeyboard-config

libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a
fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142
glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e
libX11: f57fd760cba92ad846917f21e94e73e9c846185f
libXau: 1a8a1b2c68967b48c07b56142799b1020f017027
libXext: 8eee1236041d46a21faba32e0d27c26985267d89
libXft: c5e760a239afc62a1c75e0509868e35957c8df52
libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc
libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc
mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff
xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4

1 files changed, 31 insertions, 46 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index 78287ec06..f329c5fd5 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -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]="English (UK, Sun Type 6/7)";
 
-    name[Group1]="United Kingdom";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
 
@@ -63,40 +44,44 @@ xkb_symbols "type6" {
     key <LSGT> { [  backslash,        bar             ] };
 
 	include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    name[Group1]="United Kingdom - Sun type 5";
-
-    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
-    key <AD03> {        [               e,      E,          EuroSign          ] };
-
-	include "level3(ralt_switch)"
-
+	xkb_symbols "basic" {
+	include "sun_vndr/gb(sun_type6)"
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
+	xkb_symbols "intl" {
+	include "gb(intl)"
+};
 
-    name[Group1]="United Kingdom - Sun type 4";
+partial alphanumeric_keys
+	xkb_symbols "extd" {
+	include "gb(extd)"
+};
 
-    key <AE01> { [      1,     exclam,   brokenbar ] };
-    key <AE03> { [      3,   sterling,  numbersign ] };
-    key <AE04> { [      4,     dollar,    EuroSign ] };
-    key <AE11> { [  minus, underscore,     notsign ] };
-    key <AD03> { [      e,          E,    EuroSign ] };
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "gb(colemak)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "gb(dvorak)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "dvorakukp" {
+	include "gb(dvorakukp)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "gb(mac)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/gb(type6)"
+	xkb_symbols "mac_intl" {
+	include "gb(mac_intl)"
 };