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

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index cfa27d08a..1ea594754 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
@@ -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,36 +27,16 @@
 // 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 alphanumeric_keys
-xkb_symbols "type6" {
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-     name[Group1]= "Russia";
+	name[Group1]= "Russian (Sun Type 6/7)";
 
-     key.type[group1]="FOUR_LEVEL";
+	include "sun_vndr/us(sun_type6)"
 
+	key.type[group1]="FOUR_LEVEL";
 
-    key	<AE01> { [		1,	    exclam 	] };
+    key	<AE01> { [		1,	    exclam, 1,          exclam 	] };
     key	<AE02> { [		2,        quotedbl, 2, at	] };
     key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
     key	<AE04> { [		4,       percent, 4,      dollar 	] };
@@ -65,7 +45,7 @@ xkb_symbols "type6" {
     key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
     key	<BKSL> { [           slash,        question, backslash,             bar	] };
     key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
-    key <LSGT> { [       backslash,             bar      ] };
+    key <LSGT> { [       backslash,             bar, backslash,             bar ] };
 
     key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
     key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
@@ -101,11 +81,124 @@ xkb_symbols "type6" {
     key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };
 
     include "level3(ralt_switch)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ru(sun_type6)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ru(winkeys)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ru(type6)"
+partial alphanumeric_keys
+	xkb_symbols "common" {
+	include "ru(common)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ru(legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ru(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ru(typewriter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter-legacy" {
+	include "ru(typewriter-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ru(phonetic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic_winkeys" {
+	include "ru(phonetic_winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "tt" {
+	include "ru(tt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "os_legacy" {
+	include "ru(os_legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "os_winkeys" {
+	include "ru(os_winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cv" {
+	include "ru(cv)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "udm" {
+	include "ru(udm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cv_latin" {
+	include "ru(cv_latin)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "kom" {
+	include "ru(kom)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "sah" {
+	include "ru(sah)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "xal" {
+	include "ru(xal)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dos" {
+	include "ru(dos)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bak" {
+	include "ru(bak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "srp" {
+	include "ru(srp)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "chm" {
+	include "ru(chm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "chu" {
+	include "ru(chu)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ruu" {
+	include "ru(ruu)"
 };