Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013

Conflicts:
	mesalib/src/glsl/ast.h
	mesalib/src/glsl/glsl_parser_extras.h

75 files changed, 75 insertions, 75 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index c4355dd4e..265c18e87 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -10,7 +10,7 @@
 //
 // 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
    name[Group1]= "Afghani";
 
diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index 75e7f52de..ff3388647 100644
--- a/xorg-server/xkeyboard-config/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
@@ -3,7 +3,7 @@
 // done by Pablo Saratxaga <pablo@mandrakesoft.com>
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type3)"
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index c3be81db0..9b092f4d6 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/am' file
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Armenian";
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index f39fddb56..5ecffa4c3 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/ar' file
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Arabic";
 
diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index 2dab93a3c..cfdc93cea 100644
--- a/xorg-server/xkeyboard-config/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
@@ -1,7 +1,7 @@
 // Symbols definition for a very simple Azerbaidjani keyboard layout.
 // 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "latin" {
 
   include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index c82cb7d6f..ffb89e420 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/be' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index 2bef5eadb..3b7fd4be0 100644
--- a/xorg-server/xkeyboard-config/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
@@ -44,7 +44,7 @@
 // Describes Bulgarian keyboard "BDS" modified according to the
 // the new state standard BDS 5237:2006 and extended with symbols in
 // levels 3 and 4.
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "bds" {
 
   name[Group1]= "Bulgarian";
diff --git a/xorg-server/xkeyboard-config/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai
index 2a7072d45..036b56ff9 100644
--- a/xorg-server/xkeyboard-config/symbols/brai
+++ b/xorg-server/xkeyboard-config/symbols/brai
@@ -1,5 +1,5 @@
 // 10-dot patterns on the home row + v and n
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "home_row" {
     include "brai(keypad)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt
index 980b5c690..f76f13a4c 100644
--- a/xorg-server/xkeyboard-config/symbols/bt
+++ b/xorg-server/xkeyboard-config/symbols/bt
@@ -13,7 +13,7 @@
 //   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
 /////////////////////////////////////////////////////////////////
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
       name[Group1]= "Dzongkha";
 
diff --git a/xorg-server/xkeyboard-config/symbols/bw b/xorg-server/xkeyboard-config/symbols/bw
index 0baadbaa3..29fdc1c02 100644
--- a/xorg-server/xkeyboard-config/symbols/bw
+++ b/xorg-server/xkeyboard-config/symbols/bw
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys  
+default partial alphanumeric_keys
 xkb_symbols "tswana" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 36994d3e1..443a76426 100644
--- a/xorg-server/xkeyboard-config/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
@@ -5,7 +5,7 @@
 // Added third level with russian symbols
 // See freedesktop.org bug #23604
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 	include "ru(winkeys)"
 	name[Group1]= "Belarusian";
diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in
index 384422ac4..e5b09e8a3 100644
--- a/xorg-server/xkeyboard-config/symbols/cd.in
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
@@ -1,7 +1,7 @@
 // based on us_intl keyboard map file and a Sinhala keyboard map
 // version 0.3
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "French (Democratic Republic of the Congo)";
diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch
index 59174076e..671c3c5e8 100644
--- a/xorg-server/xkeyboard-config/symbols/ch
+++ b/xorg-server/xkeyboard-config/symbols/ch
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index cceb64b7d..75ebbf66a 100644
--- a/xorg-server/xkeyboard-config/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
@@ -1,7 +1,7 @@
 //
 // Default Chinese is the same as American
 //
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "us(basic)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index 336050ceb..3d3170029 100644
--- a/xorg-server/xkeyboard-config/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
      
      // This layout conforms to a new cz compromise standard designed 
diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index 4e656b209..4619357a6 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/dk' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type2)"
diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index eb26d50bc..61d865cf1 100644
--- a/xorg-server/xkeyboard-config/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
@@ -2,7 +2,7 @@
 // Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 4196762a6..b9066fb01 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -1,6 +1,6 @@
 // Modified for a real Spanish keyboard by Jon Tombs.
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index 22ba892aa..a591a77a4 100644
--- a/xorg-server/xkeyboard-config/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
@@ -5,7 +5,7 @@
 // 2007 Sergey Udaltsov <svu@gnome.org>
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "et(olpc)"
     name[Group1]="Amharic";
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index b8b2183b4..4778f7d16 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -6,7 +6,7 @@
 // Eliminate deadkeys alternative sent by Linus Torvalds
 //
 
-partial alphanumeric_keys default
+default partial alphanumeric_keys
 xkb_symbols "kotoistus" {
 
     // Official keymap for Finland based on SFS 5966 standard
diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index b0b24ce75..283e13d6d 100644
--- a/xorg-server/xkeyboard-config/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type2)"
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 71b20b44b..e5e83eff4 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb
index 949b2491f..135583356 100644
--- a/xorg-server/xkeyboard-config/symbols/gb
+++ b/xorg-server/xkeyboard-config/symbols/gb
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/gb' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index 57c02a0d6..5a5c69dae 100644
--- a/xorg-server/xkeyboard-config/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
@@ -15,7 +15,7 @@
 // 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Georgian";
diff --git a/xorg-server/xkeyboard-config/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh
index 93015a7ff..995abb829 100644
--- a/xorg-server/xkeyboard-config/symbols/gh
+++ b/xorg-server/xkeyboard-config/symbols/gh
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys  
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn
index f85e98ec3..7f796c541 100644
--- a/xorg-server/xkeyboard-config/symbols/gn
+++ b/xorg-server/xkeyboard-config/symbols/gn
@@ -1,7 +1,7 @@
 // based on us_intl keyboard map file and a Sinhala keyboard map
 // version 0.3
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="French (Guinea)";
diff --git a/xorg-server/xkeyboard-config/symbols/ie b/xorg-server/xkeyboard-config/symbols/ie
index 070c9d9a3..3e39d57f9 100644
--- a/xorg-server/xkeyboard-config/symbols/ie
+++ b/xorg-server/xkeyboard-config/symbols/ie
@@ -22,7 +22,7 @@
 // without use of a deadkey.
 
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Modern keyboard for Irish and English
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 78425339b..91da6db7a 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -4,7 +4,7 @@
 // It does not implement changes to the English layout ("Alt-English"), 
 // as I believe that it is not the job of this layout to modify the English
 // layout.
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     // uses the kbd layout in use in Israel.
 
diff --git a/xorg-server/xkeyboard-config/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq
index 5430b53bf..597690d25 100644
--- a/xorg-server/xkeyboard-config/symbols/iq
+++ b/xorg-server/xkeyboard-config/symbols/iq
@@ -2,7 +2,7 @@
 
 // 3-Level layout
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "ara(basic)"
     name[Group1]= "Iraqi";
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 519708d75..85396b915 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -12,7 +12,7 @@
 // Author: Behnam Esfahbod <behnam@esfahbod.info>
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "pes" {
     name[Group1]= "Persian";
 
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index d2a5461b5..7b9183a82 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -1,7 +1,7 @@
 // based on a keyboard map from an 'xkb/symbols/it' file
 // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index dfb56b7c2..deac93c7c 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -1,6 +1,6 @@
 // Symbols for Japanese 106-keys keyboards (by tsuka@kawalab.dnj.ynu.ac.jp).
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "106" {
 
     include "jp(common)"
diff --git a/xorg-server/xkeyboard-config/symbols/ke b/xorg-server/xkeyboard-config/symbols/ke
index 3ecf3de89..ec2ffd05e 100644
--- a/xorg-server/xkeyboard-config/symbols/ke
+++ b/xorg-server/xkeyboard-config/symbols/ke
@@ -3,7 +3,7 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-partial default alphanumeric_keys  
+default partial alphanumeric_keys
 xkb_symbols "swa" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index 6c41f134f..51ea3f679 100644
--- a/xorg-server/xkeyboard-config/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
@@ -93,7 +93,7 @@ xkb_symbols "operators" {
     };
 };
 
-partial hidden default keypad_keys
+default partial hidden keypad_keys
 xkb_symbols "x11" {
 
     include "keypad(operators)"
diff --git a/xorg-server/xkeyboard-config/symbols/kg b/xorg-server/xkeyboard-config/symbols/kg
index bb1b2d538..1c2706017 100644
--- a/xorg-server/xkeyboard-config/symbols/kg
+++ b/xorg-server/xkeyboard-config/symbols/kg
@@ -18,7 +18,7 @@
 
 
 // Kyrgyz standard keyboard
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Kyrgyz";
diff --git a/xorg-server/xkeyboard-config/symbols/kh b/xorg-server/xkeyboard-config/symbols/kh
index d93517a33..b25cf1330 100644
--- a/xorg-server/xkeyboard-config/symbols/kh
+++ b/xorg-server/xkeyboard-config/symbols/kh
@@ -24,7 +24,7 @@
 //         but with a leading 'XK_'
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Khmer (Cambodia)";
     
diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz
index c6da615dc..276305693 100644
--- a/xorg-server/xkeyboard-config/symbols/kz
+++ b/xorg-server/xkeyboard-config/symbols/kz
@@ -10,7 +10,7 @@
 
 // RST KazSSR 903-90
 // levels 3 and 4 are non-standard extensions
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1] = "Kazakh";
diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index b302f5e71..cd24a4e3e 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -1,6 +1,6 @@
 // Lao keymap, by Anousak Souphavanh <anousak@muanglao.com>
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // This keymap describes the Lao keyboard standard,
diff --git a/xorg-server/xkeyboard-config/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam
index 6cc9c6850..4a30d6d4e 100644
--- a/xorg-server/xkeyboard-config/symbols/latam
+++ b/xorg-server/xkeyboard-config/symbols/latam
@@ -1,7 +1,7 @@
 // based on a keyboard
 // Modified for a real Latin American Keyboard by Fabian Mandelbaum
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk
index 356e060fe..b88dcdf1e 100644
--- a/xorg-server/xkeyboard-config/symbols/lk
+++ b/xorg-server/xkeyboard-config/symbols/lk
@@ -28,7 +28,7 @@
 // rayanna = r
 // yayanna = y
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "sin_phonetic" {
 
   include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 206611d9f..5610e6797 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -7,7 +7,7 @@
 //
 // If you want two layouts, use:
 // Option "XkbLayout" "lt,lt(us)"
-partial default alphanumeric_keys modifier_keys
+default partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv
index 4b0ba6c04..f0b63368c 100644
--- a/xorg-server/xkeyboard-config/symbols/lv
+++ b/xorg-server/xkeyboard-config/symbols/lv
@@ -44,7 +44,7 @@
 // Latvian QWERTY layout
 // http://en.wikipedia.org/wiki/QWERTY
 //
-partial default alphanumeric_keys modifier_keys
+default partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
 	name[Group1]= "Latvian";
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index ad3064f3f..2e3f4b1a3 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -1,5 +1,5 @@
 // Arabic AZERTY with modern Latin digits 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "arabic" {
     include "ara(azerty)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao
index ce1b2ea3c..4edc3b988 100644
--- a/xorg-server/xkeyboard-config/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Adds the macrons needed for the Maori language to
diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md
index 18b32fdee..c23d1184d 100644
--- a/xorg-server/xkeyboard-config/symbols/md
+++ b/xorg-server/xkeyboard-config/symbols/md
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "ro"
diff --git a/xorg-server/xkeyboard-config/symbols/mk b/xorg-server/xkeyboard-config/symbols/mk
index ec92c0868..456c81c85 100644
--- a/xorg-server/xkeyboard-config/symbols/mk
+++ b/xorg-server/xkeyboard-config/symbols/mk
@@ -2,7 +2,7 @@
 // Author: Damjan Georgievski <penguinista AT mail.net.mk>
 // Revision: 1.5
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" { 
     name[Group1]= "Macedonian";
 
diff --git a/xorg-server/xkeyboard-config/symbols/ml b/xorg-server/xkeyboard-config/symbols/ml
index a3a747c48..e310a0189 100644
--- a/xorg-server/xkeyboard-config/symbols/ml
+++ b/xorg-server/xkeyboard-config/symbols/ml
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "fr(basic)"
diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm
index 060e76ade..9738ce911 100644
--- a/xorg-server/xkeyboard-config/symbols/mm
+++ b/xorg-server/xkeyboard-config/symbols/mm
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Burmese";
 
diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index 943cc0c1f..f455dee8c 100644
--- a/xorg-server/xkeyboard-config/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
@@ -3,7 +3,7 @@
 // Author Sanlig Badral <badral@chinggis.com>
 // 2002/12/7 Version 1.0
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
   name[Group1]= "Mongolian";
diff --git a/xorg-server/xkeyboard-config/symbols/mt b/xorg-server/xkeyboard-config/symbols/mt
index d42064a0f..8a0cec3f9 100644
--- a/xorg-server/xkeyboard-config/symbols/mt
+++ b/xorg-server/xkeyboard-config/symbols/mt
@@ -1,7 +1,7 @@
 // Maltese keyboard map (based on MSA Standard DMS100)
 // by Ramon Casha (ramon.casha@linux.org.mt)
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv
index 5c9177b06..e34e063b4 100644
--- a/xorg-server/xkeyboard-config/symbols/mv
+++ b/xorg-server/xkeyboard-config/symbols/mv
@@ -1,6 +1,6 @@
 // Keymap for Thaana/Dhivehi script (Dhivehi language).
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="Dhivehi";
diff --git a/xorg-server/xkeyboard-config/symbols/ng b/xorg-server/xkeyboard-config/symbols/ng
index ecf5be79e..313941a91 100644
--- a/xorg-server/xkeyboard-config/symbols/ng
+++ b/xorg-server/xkeyboard-config/symbols/ng
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys  
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 5e4cffdcf..6ecdb9a7a 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/no' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index ed7c2077a..5cebac4c8 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/dev' file
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
       name[Group1]= "Nepali";
diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc
index 20bb92f31..e95e2406e 100644
--- a/xorg-server/xkeyboard-config/symbols/pc
+++ b/xorg-server/xkeyboard-config/symbols/pc
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys modifier_keys 
+default partial alphanumeric_keys modifier_keys
 xkb_symbols "pc105" {
 
     key <ESC>  {	[ Escape		]	};
diff --git a/xorg-server/xkeyboard-config/symbols/ph b/xorg-server/xkeyboard-config/symbols/ph
index 7b294948e..3aff18e24 100644
--- a/xorg-server/xkeyboard-config/symbols/ph
+++ b/xorg-server/xkeyboard-config/symbols/ph
@@ -41,7 +41,7 @@
 // ┃Ctrl   ┃Super  ┃Alt    ┃ ␣ Space             Space ␣ ┃AltGr ⇮┃Meta   ┃Menu   ┃Ctrl   ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹─────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
 //
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Filipino";
diff --git a/xorg-server/xkeyboard-config/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk
index de800d4c7..b53e3aa3c 100644
--- a/xorg-server/xkeyboard-config/symbols/pk
+++ b/xorg-server/xkeyboard-config/symbols/pk
@@ -6,7 +6,7 @@
 // Alt-key combinations are yet to be put in. The unavailable keys are
 // those which do not have a corresponding glyph in Unicode.
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "urd-phonetic" {
 
    name[Group1]= "Urdu (Pakistan)";
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index e2559b3ac..885a82afa 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/pl' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Visualisation and description: http://podziemie.net/xkb/pl
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index 010445570..4b85598a5 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/pt' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index 46e275b72..01fb8485c 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -16,7 +16,7 @@
 // v 1.4
 
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 // This RO_US/Programmers layout, although the secondary layout in the 
 // Romanian standard, has always been the "de facto" standard in the 
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index a761c30d0..d39f92672 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -5,7 +5,7 @@
 // 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
 
 // Windows layout
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "winkeys" {
     include "ru(common)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se
index ef5e797ba..d015d4015 100644
--- a/xorg-server/xkeyboard-config/symbols/se
+++ b/xorg-server/xkeyboard-config/symbols/se
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/se' file
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "latin(type2)"
     include "se(se)"
diff --git a/xorg-server/xkeyboard-config/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk
index e33b74a5e..075281320 100644
--- a/xorg-server/xkeyboard-config/symbols/sk
+++ b/xorg-server/xkeyboard-config/symbols/sk
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
      
      // This layout conforms to a new sk compromise standard designed 
diff --git a/xorg-server/xkeyboard-config/symbols/sn b/xorg-server/xkeyboard-config/symbols/sn
index 5b0befc88..77495ad4d 100644
--- a/xorg-server/xkeyboard-config/symbols/sn
+++ b/xorg-server/xkeyboard-config/symbols/sn
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy
index a7d2fbc4e..a539f4019 100644
--- a/xorg-server/xkeyboard-config/symbols/sy
+++ b/xorg-server/xkeyboard-config/symbols/sy
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     include "ara(basic)"
     name[Group1]= "Arabic (Syria)";
diff --git a/xorg-server/xkeyboard-config/symbols/terminate b/xorg-server/xkeyboard-config/symbols/terminate
index c74220bc7..60c24795c 100644
--- a/xorg-server/xkeyboard-config/symbols/terminate
+++ b/xorg-server/xkeyboard-config/symbols/terminate
@@ -1,4 +1,4 @@
-partial default modifier_keys
+default partial modifier_keys
 xkb_symbols "ctrl_alt_bksp" {
     key <BKSP> {
         type="CTRL+ALT",
diff --git a/xorg-server/xkeyboard-config/symbols/th b/xorg-server/xkeyboard-config/symbols/th
index a23ff45a3..63fd281b5 100644
--- a/xorg-server/xkeyboard-config/symbols/th
+++ b/xorg-server/xkeyboard-config/symbols/th
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/th' file
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Thai";
 
diff --git a/xorg-server/xkeyboard-config/symbols/tj b/xorg-server/xkeyboard-config/symbols/tj
index e4c4af4f6..76086056d 100644
--- a/xorg-server/xkeyboard-config/symbols/tj
+++ b/xorg-server/xkeyboard-config/symbols/tj
@@ -11,7 +11,7 @@
 // --------------------------------------------------------------------
 //
 
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "basic"
 {
 	name[Group1] = "Tajik";
diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
index c01024a81..e136319c1 100644
--- a/xorg-server/xkeyboard-config/symbols/tw
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -1,4 +1,4 @@
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "tw" {
 
     name[Group1]= "Taiwanese";
diff --git a/xorg-server/xkeyboard-config/symbols/tz b/xorg-server/xkeyboard-config/symbols/tz
index e4d50539f..60ff033be 100644
--- a/xorg-server/xkeyboard-config/symbols/tz
+++ b/xorg-server/xkeyboard-config/symbols/tz
@@ -3,7 +3,7 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "swa" {
     name[Group1]= "Swahili (Tanzania)";
 
diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index f7a2a59a4..331cbfcb3 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -5,7 +5,7 @@
 
 // Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
 // some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
-partial default alphanumeric_keys
+default partial alphanumeric_keys
 xkb_symbols "unicode" {
     include "ua(winkeys)"
  
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 73673882d..b70cb016a 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -1,5 +1,5 @@
 default
-partial alphanumeric_keys modifier_keys 
+partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     name[Group1]= "English (US)";
diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz
index f0e07ede1..d4cf48fbf 100644
--- a/xorg-server/xkeyboard-config/symbols/uz
+++ b/xorg-server/xkeyboard-config/symbols/uz
@@ -30,7 +30,7 @@
 // apostrophe is replaced with U02BB.
 // 
 
-partial default alphanumeric_keys 
+default partial alphanumeric_keys
 xkb_symbols "cyrillic" {
 
     name[Group1]= "Uzbek";
diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn
index 58eb595da..10a6d2634 100644
--- a/xorg-server/xkeyboard-config/symbols/vn
+++ b/xorg-server/xkeyboard-config/symbols/vn
@@ -8,7 +8,7 @@
 // July 2009
 
 
-partial default alphanumeric_keys  
+default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/za b/xorg-server/xkeyboard-config/symbols/za
index c5f699463..74abc8271 100644
--- a/xorg-server/xkeyboard-config/symbols/za
+++ b/xorg-server/xkeyboard-config/symbols/za
@@ -1,6 +1,6 @@
 // based on the Latvian and GB keyboard maps
 
-partial default alphanumeric_keys modifier_keys
+default partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     // Describes the differences between an en_US