Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

2 files changed, 91 insertions, 25 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index dd3251b6e..dd7339390 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -14,43 +14,43 @@
         <variant>
           <configItem>
             <name>dyalog</name>
-            <shortDescription>dlg</shortDescription>
-            <description>APL keyboard symbols (Dyalog)</description>
+            <_shortDescription>dlg</_shortDescription>
+            <_description>APL keyboard symbols (Dyalog)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sax</name>
-            <shortDescription>sax</shortDescription>
-            <description>APL keyboard symbols (sax)</description>
+            <_shortDescription>sax</_shortDescription>
+            <_description>APL keyboard symbols (sax)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unified</name>
-            <shortDescription>ufd</shortDescription>
-            <description>APL keyboard symbols (unified)</description>
+            <_shortDescription>ufd</_shortDescription>
+            <_description>APL keyboard symbols (unified)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>apl2</name>
-            <shortDescription>apl2</shortDescription>
-            <description>APL keyboard symbols (IBM APL2)</description>
+            <_shortDescription>apl2</_shortDescription>
+            <_description>APL keyboard symbols (IBM APL2)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplplusII</name>
-            <shortDescription>aplII</shortDescription>
-            <description>APL keyboard symbols (Manugistics APL*PLUS II)</description>
+            <_shortDescription>aplII</_shortDescription>
+            <_description>APL keyboard symbols (Manugistics APL*PLUS II)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplx</name>
-            <shortDescription>aplx</shortDescription>
-            <description>APL keyboard symbols (APLX unified)</description>
+            <_shortDescription>aplx</_shortDescription>
+            <_description>APL keyboard symbols (APLX unified)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -264,7 +264,7 @@
         <variant>
           <configItem>
             <name>cz_sk_de</name>
-            <description>Czech Slovak and German (US)</description>
+            <_description>Czech Slovak and German (US)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>cze</iso639Id>
                           <iso639Id>slo</iso639Id>
@@ -371,7 +371,7 @@
         <variant>
           <configItem>
             <name>chu</name>
-            <description>Church Slavonic</description>
+            <_description>Church Slavonic</_description>
             <languageList><iso639Id>chu</iso639Id></languageList>
           </configItem>
         </variant>
@@ -776,6 +776,33 @@
         </variant>
 	  </variantList>
 	</layout>
+    <layout>
+      <configItem>
+	<name>eu</name>
+	<!-- Keyboard indicator for European layouts -->
+	<_shortDescription>eu</_shortDescription>
+	<_description>EurKEY (US based layout with european letters)</_description>
+	  <languageList>
+	    <iso639Id>cat</iso639Id>
+	    <iso639Id>dan</iso639Id>
+	    <iso639Id>eng</iso639Id>
+	    <iso639Id>est</iso639Id>
+	    <iso639Id>fao</iso639Id>
+	    <iso639Id>fin</iso639Id>
+	    <iso639Id>ger</iso639Id>
+	    <iso639Id>gre</iso639Id>
+	    <iso639Id>gsw</iso639Id>
+	    <iso639Id>ita</iso639Id>
+	    <iso639Id>lav</iso639Id>
+	    <iso639Id>lit</iso639Id>
+	    <iso639Id>nld</iso639Id>
+	    <iso639Id>nor</iso639Id>
+	    <iso639Id>por</iso639Id>
+	    <iso639Id>spa</iso639Id>
+	    <iso639Id>swe</iso639Id>
+	</languageList>
+      </configItem>
+    </layout>
   </layoutList>
   <optionList/>
 </xkbConfigRegistry>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index eb9586680..198b3a7be 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1839,7 +1839,7 @@
         <variant>
           <configItem>
             <name>eeyek</name>
-            <description>Manipuri (Eeyek)</description>
+            <_description>Manipuri (Eeyek)</_description>
             <languageList><iso639Id>mni</iso639Id></languageList>
           </configItem>
         </variant>
@@ -1925,7 +1925,7 @@
             <name>mal_enhanced</name>
             <!-- Keyboard indicator for Malayalam layouts -->
             <_shortDescription>ml</_shortDescription>
-            <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description>
+            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
             <languageList><iso639Id>mal</iso639Id></languageList>
           </configItem>
          </variant>
@@ -2110,7 +2110,7 @@
             <name>eng</name>
             <!-- Keyboard indicator for English layouts -->
             <_shortDescription>en</_shortDescription>
-            <_description>English (India, with RupeeSign)</_description>
+            <_description>English (India, with rupee sign)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
             </languageList>
@@ -2132,13 +2132,13 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Bosnian (use guillemets for quotes)</_description>
+            <_description>Bosnian (with guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Bosnian (use Bosnian digraphs)</_description>
+            <_description>Bosnian (with Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2559,13 +2559,13 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Croatian (use guillemets for quotes)</_description>
+            <_description>Croatian (with guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Croatian (use Croatian digraphs)</_description>
+            <_description>Croatian (with Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2644,6 +2644,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>winkeys</name>
+            <_description>Danish (Winkeys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>mac</name>
             <_description>Danish (Macintosh)</_description>
           </configItem>
@@ -2749,7 +2755,7 @@
         <variant>
           <configItem>
             <name>pes_keypad</name>
-            <_description>Persian (with Persian Keypad)</_description>
+            <_description>Persian (with Persian keypad)</_description>
           </configItem>
         </variant>
         <variant>
@@ -2898,6 +2904,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>winkeys</name>
+            <_description>Finnish (Winkeys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>smi</name>
             <_description>Northern Saami (Finland)</_description>
             <languageList><iso639Id>sme</iso639Id></languageList>
@@ -3279,6 +3291,15 @@
         </variant>
         <variant>
           <configItem>
+            <name>tr</name>
+            <_description>Turkish (Germany)</_description>
+            <languageList>
+              <iso639Id>tr</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>ru</name>
             <!-- Keyboard indicator for Russian layouts -->
             <_shortDescription>ru</_shortDescription>
@@ -3547,6 +3568,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>winkeys</name>
+            <_description>Italian (Winkeys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>mac</name>
             <_description>Italian (Macintosh)</_description>
           </configItem>
@@ -3984,6 +4011,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>winkeys</name>
+            <_description>Norwegian (Winkeys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>dvorak</name>
             <_description>Norwegian (Dvorak)</_description>
           </configItem>
@@ -4079,7 +4112,7 @@
         <variant>
           <configItem>
             <name>szl</name>
-            <description>Silesian</description>
+            <_description>Silesian</_description>
             <languageList><iso639Id>szl</iso639Id></languageList>
           </configItem>
         </variant>
@@ -4443,7 +4476,7 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Slovenian (use guillemets for quotes)</_description>
+            <_description>Slovenian (with guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4504,6 +4537,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>winkeys</name>
+            <_description>Spanish (Winkeys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>deadtilde</name>
             <_description>Spanish (include dead tilde)</_description>
           </configItem>
@@ -6343,7 +6382,7 @@
       <option>
         <configItem>
           <name>altwin:hyper_win</name>
-          <_description>Hyper is mapped to Win-keys</_description>
+          <_description>Hyper is mapped to Win keys</_description>
         </configItem>
       </option>
       <option>