xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3

1 files changed, 16 insertions, 17 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 86b54632a..06025e17e 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -40,12 +40,10 @@ xkb_symbols "latin" {
 
 partial alphanumeric_keys
 xkb_symbols "yz" {
-  // Cyrillic_zhe and Cyrillic_ze swapped.
-
-  name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)";
+
   key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
   key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
 };
@@ -247,9 +245,10 @@ xkb_symbols "latinunicode" {
   // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
   // as single character). You get the title form with AltGr+Shift.
 
+  include "rs(latin)"
+
   name[Group1]= "Serbian (Latin Unicode)";
 
-  include "rs(latin)"
   include "rs(twoletter)"
 };
 
@@ -257,10 +256,10 @@ partial alphanumeric_keys
 xkb_symbols "latinyz" {
   // For those who insist on using "english-position" Z and Y.
 
-  name[Group1]= "Serbian (Latin qwerty)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin qwerty)";
+
   key <AD06> {   [ y,                   Y,             any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -269,10 +268,10 @@ partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   // Unicode, ZHE and Z swapped.
 
-  name[Group1]= "Serbian (Latin Unicode qwerty)";
-
   include "rs(latinunicode)"
 
+  name[Group1]= "Serbian (Latin Unicode qwerty)";
+
   key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -280,10 +279,10 @@ xkb_symbols "latinunicodeyz" {
 xkb_symbols "alternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Cyrillic with guillemets)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -291,10 +290,10 @@ xkb_symbols "alternatequotes" {
 xkb_symbols "latinalternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Latin with guillemets)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -306,10 +305,10 @@ xkb_symbols "rue" {
   //   Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
   //   Mihajlo Hornjak <smeceiotpad@gmail.com>
 
-  name[Group1]= "Pannonian Rusyn";
-
   include "rs(basic)"
 
+  name[Group1]= "Pannonian Rusyn";
+
   key <TLDE> {   [ Cyrillic_softsign,         Cyrillic_SOFTSIGN         ]   }; // `
 
   key <AD01> {   [ Cyrillic_ya,               Cyrillic_YA               ]   }; // q
@@ -330,10 +329,10 @@ xkb_symbols "combiningkeys" {
   // Raw combining characters instead of dead keys,
   // especially good for post-accenting texts.
 
-  name[Group1]= "Serbian (combining accents instead of dead keys)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (combining accents instead of dead keys)";
+
   key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
   key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT
   key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT