456 files changed, 0 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/ABOUT-NLS b/xorg-server/xkeyboard-config/ABOUT-NLS
index 2f50c6693..2f50c6693 100644
--- a/xorg-server/xkbdata.src/ABOUT-NLS
+++ b/xorg-server/xkeyboard-config/ABOUT-NLS
diff --git a/xorg-server/xkbdata.src/AUTHORS b/xorg-server/xkeyboard-config/AUTHORS
index 451e9c08d..451e9c08d 100644
--- a/xorg-server/xkbdata.src/AUTHORS
+++ b/xorg-server/xkeyboard-config/AUTHORS
diff --git a/xorg-server/xkbdata.src/BUGS b/xorg-server/xkeyboard-config/BUGS
index cb48ff636..cb48ff636 100644
--- a/xorg-server/xkbdata.src/BUGS
+++ b/xorg-server/xkeyboard-config/BUGS
diff --git a/xorg-server/xkbdata.src/COPYING b/xorg-server/xkeyboard-config/COPYING
index 4efb62906..4efb62906 100644
--- a/xorg-server/xkbdata.src/COPYING
+++ b/xorg-server/xkeyboard-config/COPYING
diff --git a/xorg-server/xkbdata.src/CREDITS b/xorg-server/xkeyboard-config/CREDITS
index 7a05b27ec..7a05b27ec 100644
--- a/xorg-server/xkbdata.src/CREDITS
+++ b/xorg-server/xkeyboard-config/CREDITS
diff --git a/xorg-server/xkbdata.src/ChangeLog b/xorg-server/xkeyboard-config/ChangeLog
index 28c811580..28c811580 100644
--- a/xorg-server/xkbdata.src/ChangeLog
+++ b/xorg-server/xkeyboard-config/ChangeLog
diff --git a/xorg-server/xkbdata.src/ChangeLog.old b/xorg-server/xkeyboard-config/ChangeLog.old
index 40e24271b..40e24271b 100644
--- a/xorg-server/xkbdata.src/ChangeLog.old
+++ b/xorg-server/xkeyboard-config/ChangeLog.old
diff --git a/xorg-server/xkbdata.src/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am
index e98117e8e..e98117e8e 100644
--- a/xorg-server/xkbdata.src/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
diff --git a/xorg-server/xkbdata.src/NEWS b/xorg-server/xkeyboard-config/NEWS
index 5ad25a6bb..5ad25a6bb 100644
--- a/xorg-server/xkbdata.src/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
diff --git a/xorg-server/xkbdata.src/README b/xorg-server/xkeyboard-config/README
index d91eda6e6..d91eda6e6 100644
--- a/xorg-server/xkbdata.src/README
+++ b/xorg-server/xkeyboard-config/README
diff --git a/xorg-server/xkbdata.src/TODO b/xorg-server/xkeyboard-config/TODO
index 8a10faa02..8a10faa02 100644
--- a/xorg-server/xkbdata.src/TODO
+++ b/xorg-server/xkeyboard-config/TODO
diff --git a/xorg-server/xkbdata.src/autogen.sh b/xorg-server/xkeyboard-config/autogen.sh
index f9cd42b58..f9cd42b58 100644
--- a/xorg-server/xkbdata.src/autogen.sh
+++ b/xorg-server/xkeyboard-config/autogen.sh
diff --git a/xorg-server/xkbdata.src/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am
index 54a659eec..54a659eec 100644
--- a/xorg-server/xkbdata.src/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/compat/Makefile.am
diff --git a/xorg-server/xkbdata.src/compat/README b/xorg-server/xkeyboard-config/compat/README
index 00d591e7b..00d591e7b 100644
--- a/xorg-server/xkbdata.src/compat/README
+++ b/xorg-server/xkeyboard-config/compat/README
diff --git a/xorg-server/xkbdata.src/compat/accessx b/xorg-server/xkeyboard-config/compat/accessx
index 3e4b46163..3e4b46163 100644
--- a/xorg-server/xkbdata.src/compat/accessx
+++ b/xorg-server/xkeyboard-config/compat/accessx
diff --git a/xorg-server/xkbdata.src/compat/basic b/xorg-server/xkeyboard-config/compat/basic
index 8f99c7b73..8f99c7b73 100644
--- a/xorg-server/xkbdata.src/compat/basic
+++ b/xorg-server/xkeyboard-config/compat/basic
diff --git a/xorg-server/xkbdata.src/compat/caps b/xorg-server/xkeyboard-config/compat/caps
index d787ab63d..d787ab63d 100644
--- a/xorg-server/xkbdata.src/compat/caps
+++ b/xorg-server/xkeyboard-config/compat/caps
diff --git a/xorg-server/xkbdata.src/compat/complete b/xorg-server/xkeyboard-config/compat/complete
index dd49a5c43..dd49a5c43 100644
--- a/xorg-server/xkbdata.src/compat/complete
+++ b/xorg-server/xkeyboard-config/compat/complete
diff --git a/xorg-server/xkbdata.src/compat/default b/xorg-server/xkeyboard-config/compat/default
index 5355e1318..5355e1318 100644
--- a/xorg-server/xkbdata.src/compat/default
+++ b/xorg-server/xkeyboard-config/compat/default
diff --git a/xorg-server/xkbdata.src/compat/iso9995 b/xorg-server/xkeyboard-config/compat/iso9995
index d513c1ce4..d513c1ce4 100644
--- a/xorg-server/xkbdata.src/compat/iso9995
+++ b/xorg-server/xkeyboard-config/compat/iso9995
diff --git a/xorg-server/xkbdata.src/compat/japan b/xorg-server/xkeyboard-config/compat/japan
index 00187d00f..00187d00f 100644
--- a/xorg-server/xkbdata.src/compat/japan
+++ b/xorg-server/xkeyboard-config/compat/japan
diff --git a/xorg-server/xkbdata.src/compat/keypad b/xorg-server/xkeyboard-config/compat/keypad
index 469edec28..469edec28 100644
--- a/xorg-server/xkbdata.src/compat/keypad
+++ b/xorg-server/xkeyboard-config/compat/keypad
diff --git a/xorg-server/xkbdata.src/compat/ledcaps b/xorg-server/xkeyboard-config/compat/ledcaps
index fc3084eec..fc3084eec 100644
--- a/xorg-server/xkbdata.src/compat/ledcaps
+++ b/xorg-server/xkeyboard-config/compat/ledcaps
diff --git a/xorg-server/xkbdata.src/compat/lednum b/xorg-server/xkeyboard-config/compat/lednum
index 24a60a595..24a60a595 100644
--- a/xorg-server/xkbdata.src/compat/lednum
+++ b/xorg-server/xkeyboard-config/compat/lednum
diff --git a/xorg-server/xkbdata.src/compat/ledscroll b/xorg-server/xkeyboard-config/compat/ledscroll
index ca5a82c4c..ca5a82c4c 100644
--- a/xorg-server/xkbdata.src/compat/ledscroll
+++ b/xorg-server/xkeyboard-config/compat/ledscroll
diff --git a/xorg-server/xkbdata.src/compat/level5 b/xorg-server/xkeyboard-config/compat/level5
index 47693549f..47693549f 100644
--- a/xorg-server/xkbdata.src/compat/level5
+++ b/xorg-server/xkeyboard-config/compat/level5
diff --git a/xorg-server/xkbdata.src/compat/misc b/xorg-server/xkeyboard-config/compat/misc
index 68cda9594..68cda9594 100644
--- a/xorg-server/xkbdata.src/compat/misc
+++ b/xorg-server/xkeyboard-config/compat/misc
diff --git a/xorg-server/xkbdata.src/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys
index fbd2b889a..fbd2b889a 100644
--- a/xorg-server/xkbdata.src/compat/mousekeys
+++ b/xorg-server/xkeyboard-config/compat/mousekeys
diff --git a/xorg-server/xkbdata.src/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat
index 07b0b7a60..07b0b7a60 100644
--- a/xorg-server/xkbdata.src/compat/norepeat
+++ b/xorg-server/xkeyboard-config/compat/norepeat
diff --git a/xorg-server/xkbdata.src/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc
index 001da12c1..001da12c1 100644
--- a/xorg-server/xkbdata.src/compat/olpc
+++ b/xorg-server/xkeyboard-config/compat/olpc
diff --git a/xorg-server/xkbdata.src/compat/pc b/xorg-server/xkeyboard-config/compat/pc
index 5ce7d767d..5ce7d767d 100644
--- a/xorg-server/xkbdata.src/compat/pc
+++ b/xorg-server/xkeyboard-config/compat/pc
diff --git a/xorg-server/xkbdata.src/compat/pc98 b/xorg-server/xkeyboard-config/compat/pc98
index 23f3f7987..23f3f7987 100644
--- a/xorg-server/xkbdata.src/compat/pc98
+++ b/xorg-server/xkeyboard-config/compat/pc98
diff --git a/xorg-server/xkbdata.src/compat/xfree86 b/xorg-server/xkeyboard-config/compat/xfree86
index 2da65fd6a..2da65fd6a 100644
--- a/xorg-server/xkbdata.src/compat/xfree86
+++ b/xorg-server/xkeyboard-config/compat/xfree86
diff --git a/xorg-server/xkbdata.src/compat/xtest b/xorg-server/xkeyboard-config/compat/xtest
index a35ced915..a35ced915 100644
--- a/xorg-server/xkbdata.src/compat/xtest
+++ b/xorg-server/xkeyboard-config/compat/xtest
diff --git a/xorg-server/xkbdata.src/config.rpath b/xorg-server/xkeyboard-config/config.rpath
index e69de29bb..e69de29bb 100644
--- a/xorg-server/xkbdata.src/config.rpath
+++ b/xorg-server/xkeyboard-config/config.rpath
diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkeyboard-config/configure.in
index 99cd9bb24..99cd9bb24 100644
--- a/xorg-server/xkbdata.src/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.testing b/xorg-server/xkeyboard-config/docs/HOWTO.testing
index 01aa0500c..01aa0500c 100644
--- a/xorg-server/xkbdata.src/docs/HOWTO.testing
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.testing
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.transition b/xorg-server/xkeyboard-config/docs/HOWTO.transition
index 24add85f5..24add85f5 100644
--- a/xorg-server/xkbdata.src/docs/HOWTO.transition
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.transition
diff --git a/xorg-server/xkbdata.src/docs/Makefile.am b/xorg-server/xkeyboard-config/docs/Makefile.am
index 5ae0e80a1..5ae0e80a1 100644
--- a/xorg-server/xkbdata.src/docs/Makefile.am
+++ b/xorg-server/xkeyboard-config/docs/Makefile.am
diff --git a/xorg-server/xkbdata.src/docs/README.config b/xorg-server/xkeyboard-config/docs/README.config
index 4a068867d..4a068867d 100644
--- a/xorg-server/xkbdata.src/docs/README.config
+++ b/xorg-server/xkeyboard-config/docs/README.config
diff --git a/xorg-server/xkbdata.src/docs/README.enhancing b/xorg-server/xkeyboard-config/docs/README.enhancing
index 024ea146e..024ea146e 100644
--- a/xorg-server/xkbdata.src/docs/README.enhancing
+++ b/xorg-server/xkeyboard-config/docs/README.enhancing
diff --git a/xorg-server/xkbdata.src/docs/README.symbols b/xorg-server/xkeyboard-config/docs/README.symbols
index 749618e77..749618e77 100644
--- a/xorg-server/xkbdata.src/docs/README.symbols
+++ b/xorg-server/xkeyboard-config/docs/README.symbols
diff --git a/xorg-server/xkbdata.src/docs/iso15924.csv b/xorg-server/xkeyboard-config/docs/iso15924.csv
index 0c751839b..0c751839b 100644
--- a/xorg-server/xkbdata.src/docs/iso15924.csv
+++ b/xorg-server/xkeyboard-config/docs/iso15924.csv
diff --git a/xorg-server/xkbdata.src/docs/iso3166-3.csv b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
index 0e5a44e17..0e5a44e17 100644
--- a/xorg-server/xkbdata.src/docs/iso3166-3.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
diff --git a/xorg-server/xkbdata.src/docs/iso3166.csv b/xorg-server/xkeyboard-config/docs/iso3166.csv
index f08b3da03..f08b3da03 100644
--- a/xorg-server/xkbdata.src/docs/iso3166.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166.csv
diff --git a/xorg-server/xkbdata.src/docs/iso639.csv b/xorg-server/xkeyboard-config/docs/iso639.csv
index d582d8cc5..d582d8cc5 100644
--- a/xorg-server/xkbdata.src/docs/iso639.csv
+++ b/xorg-server/xkeyboard-config/docs/iso639.csv
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.am b/xorg-server/xkeyboard-config/geometry/Makefile.am
index 84619fb96..84619fb96 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/Makefile.am
diff --git a/xorg-server/xkbdata.src/geometry/README b/xorg-server/xkeyboard-config/geometry/README
index 5f4dcc72c..5f4dcc72c 100644
--- a/xorg-server/xkbdata.src/geometry/README
+++ b/xorg-server/xkeyboard-config/geometry/README
diff --git a/xorg-server/xkbdata.src/geometry/amiga b/xorg-server/xkeyboard-config/geometry/amiga
index 357c4c0e1..357c4c0e1 100644
--- a/xorg-server/xkbdata.src/geometry/amiga
+++ b/xorg-server/xkeyboard-config/geometry/amiga
diff --git a/xorg-server/xkbdata.src/geometry/ataritt b/xorg-server/xkeyboard-config/geometry/ataritt
index e53cd94c2..e53cd94c2 100644
--- a/xorg-server/xkbdata.src/geometry/ataritt
+++ b/xorg-server/xkeyboard-config/geometry/ataritt
diff --git a/xorg-server/xkbdata.src/geometry/chicony b/xorg-server/xkeyboard-config/geometry/chicony
index 9bdd15b00..9bdd15b00 100644
--- a/xorg-server/xkbdata.src/geometry/chicony
+++ b/xorg-server/xkeyboard-config/geometry/chicony
diff --git a/xorg-server/xkbdata.src/geometry/dell b/xorg-server/xkeyboard-config/geometry/dell
index 064f8e6e5..064f8e6e5 100644
--- a/xorg-server/xkbdata.src/geometry/dell
+++ b/xorg-server/xkeyboard-config/geometry/dell
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am
index 821c0ccf4..821c0ccf4 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/lk b/xorg-server/xkeyboard-config/geometry/digital_vndr/lk
index 1ccd33163..1ccd33163 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/lk
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/pc b/xorg-server/xkeyboard-config/geometry/digital_vndr/pc
index ad4ffc655..ad4ffc655 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/pc
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/unix b/xorg-server/xkeyboard-config/geometry/digital_vndr/unix
index 2ca477e82..2ca477e82 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/unix
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/unix
diff --git a/xorg-server/xkbdata.src/geometry/everex b/xorg-server/xkeyboard-config/geometry/everex
index e70490680..e70490680 100644
--- a/xorg-server/xkbdata.src/geometry/everex
+++ b/xorg-server/xkeyboard-config/geometry/everex
diff --git a/xorg-server/xkbdata.src/geometry/fujitsu b/xorg-server/xkeyboard-config/geometry/fujitsu
index 02fe0bc20..02fe0bc20 100644
--- a/xorg-server/xkbdata.src/geometry/fujitsu
+++ b/xorg-server/xkeyboard-config/geometry/fujitsu
diff --git a/xorg-server/xkbdata.src/geometry/hhk b/xorg-server/xkeyboard-config/geometry/hhk
index 901642b10..901642b10 100644
--- a/xorg-server/xkbdata.src/geometry/hhk
+++ b/xorg-server/xkeyboard-config/geometry/hhk
diff --git a/xorg-server/xkbdata.src/geometry/hp b/xorg-server/xkeyboard-config/geometry/hp
index 62e4d8a18..62e4d8a18 100644
--- a/xorg-server/xkbdata.src/geometry/hp
+++ b/xorg-server/xkeyboard-config/geometry/hp
diff --git a/xorg-server/xkbdata.src/geometry/keytronic b/xorg-server/xkeyboard-config/geometry/keytronic
index 110274a2d..110274a2d 100644
--- a/xorg-server/xkbdata.src/geometry/keytronic
+++ b/xorg-server/xkeyboard-config/geometry/keytronic
diff --git a/xorg-server/xkbdata.src/geometry/kinesis b/xorg-server/xkeyboard-config/geometry/kinesis
index 05acf4b6e..05acf4b6e 100644
--- a/xorg-server/xkbdata.src/geometry/kinesis
+++ b/xorg-server/xkeyboard-config/geometry/kinesis
diff --git a/xorg-server/xkbdata.src/geometry/macintosh b/xorg-server/xkeyboard-config/geometry/macintosh
index 216612262..216612262 100644
--- a/xorg-server/xkbdata.src/geometry/macintosh
+++ b/xorg-server/xkeyboard-config/geometry/macintosh
diff --git a/xorg-server/xkbdata.src/geometry/microsoft b/xorg-server/xkeyboard-config/geometry/microsoft
index ba027224f..ba027224f 100644
--- a/xorg-server/xkbdata.src/geometry/microsoft
+++ b/xorg-server/xkeyboard-config/geometry/microsoft
diff --git a/xorg-server/xkbdata.src/geometry/nec b/xorg-server/xkeyboard-config/geometry/nec
index 189d9ca7c..189d9ca7c 100644
--- a/xorg-server/xkbdata.src/geometry/nec
+++ b/xorg-server/xkeyboard-config/geometry/nec
diff --git a/xorg-server/xkbdata.src/geometry/nokia b/xorg-server/xkeyboard-config/geometry/nokia
index 5132840ca..5132840ca 100644
--- a/xorg-server/xkbdata.src/geometry/nokia
+++ b/xorg-server/xkeyboard-config/geometry/nokia
diff --git a/xorg-server/xkbdata.src/geometry/northgate b/xorg-server/xkeyboard-config/geometry/northgate
index cf0c6f477..cf0c6f477 100644
--- a/xorg-server/xkbdata.src/geometry/northgate
+++ b/xorg-server/xkeyboard-config/geometry/northgate
diff --git a/xorg-server/xkbdata.src/geometry/pc b/xorg-server/xkeyboard-config/geometry/pc
index ee923fc31..ee923fc31 100644
--- a/xorg-server/xkbdata.src/geometry/pc
+++ b/xorg-server/xkeyboard-config/geometry/pc
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am
index 5c76e4b4c..5c76e4b4c 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/O2 b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
index c321fe398..c321fe398 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/O2
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/indigo b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo
index c91c5c2f3..c91c5c2f3 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/indigo
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/indy b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy
index 98d511fa7..98d511fa7 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/indy
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy
diff --git a/xorg-server/xkbdata.src/geometry/sony b/xorg-server/xkeyboard-config/geometry/sony
index 4e69f0e9a..4e69f0e9a 100644
--- a/xorg-server/xkbdata.src/geometry/sony
+++ b/xorg-server/xkeyboard-config/geometry/sony
diff --git a/xorg-server/xkbdata.src/geometry/sun b/xorg-server/xkeyboard-config/geometry/sun
index 585eb2615..585eb2615 100644
--- a/xorg-server/xkbdata.src/geometry/sun
+++ b/xorg-server/xkeyboard-config/geometry/sun
diff --git a/xorg-server/xkbdata.src/geometry/thinkpad b/xorg-server/xkeyboard-config/geometry/thinkpad
index 031586662..031586662 100644
--- a/xorg-server/xkbdata.src/geometry/thinkpad
+++ b/xorg-server/xkeyboard-config/geometry/thinkpad
diff --git a/xorg-server/xkbdata.src/geometry/typematrix b/xorg-server/xkeyboard-config/geometry/typematrix
index d86976f8f..d86976f8f 100644
--- a/xorg-server/xkbdata.src/geometry/typematrix
+++ b/xorg-server/xkeyboard-config/geometry/typematrix
diff --git a/xorg-server/xkbdata.src/geometry/winbook b/xorg-server/xkeyboard-config/geometry/winbook
index e4de47861..e4de47861 100644
--- a/xorg-server/xkbdata.src/geometry/winbook
+++ b/xorg-server/xkeyboard-config/geometry/winbook
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.am b/xorg-server/xkeyboard-config/keycodes/Makefile.am
index 2876ca9f1..2876ca9f1 100644
--- a/xorg-server/xkbdata.src/keycodes/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/Makefile.am
diff --git a/xorg-server/xkbdata.src/keycodes/README b/xorg-server/xkeyboard-config/keycodes/README
index 6363f3d55..6363f3d55 100644
--- a/xorg-server/xkbdata.src/keycodes/README
+++ b/xorg-server/xkeyboard-config/keycodes/README
diff --git a/xorg-server/xkbdata.src/keycodes/aliases b/xorg-server/xkeyboard-config/keycodes/aliases
index f398772fe..f398772fe 100644
--- a/xorg-server/xkbdata.src/keycodes/aliases
+++ b/xorg-server/xkeyboard-config/keycodes/aliases
diff --git a/xorg-server/xkbdata.src/keycodes/amiga b/xorg-server/xkeyboard-config/keycodes/amiga
index 7d2576701..7d2576701 100644
--- a/xorg-server/xkbdata.src/keycodes/amiga
+++ b/xorg-server/xkeyboard-config/keycodes/amiga
diff --git a/xorg-server/xkbdata.src/keycodes/ataritt b/xorg-server/xkeyboard-config/keycodes/ataritt
index 7eae09f49..7eae09f49 100644
--- a/xorg-server/xkbdata.src/keycodes/ataritt
+++ b/xorg-server/xkeyboard-config/keycodes/ataritt
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
index 4f4cc4fd9..4f4cc4fd9 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/lk b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
index 8523b95dd..8523b95dd 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/pc b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
index 511715627..511715627 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
diff --git a/xorg-server/xkbdata.src/keycodes/empty b/xorg-server/xkeyboard-config/keycodes/empty
index af0b18083..af0b18083 100644
--- a/xorg-server/xkbdata.src/keycodes/empty
+++ b/xorg-server/xkeyboard-config/keycodes/empty
diff --git a/xorg-server/xkbdata.src/keycodes/evdev b/xorg-server/xkeyboard-config/keycodes/evdev
index d6963a2d5..d6963a2d5 100644
--- a/xorg-server/xkbdata.src/keycodes/evdev
+++ b/xorg-server/xkeyboard-config/keycodes/evdev
diff --git a/xorg-server/xkbdata.src/keycodes/fujitsu b/xorg-server/xkeyboard-config/keycodes/fujitsu
index c36a3a984..c36a3a984 100644
--- a/xorg-server/xkbdata.src/keycodes/fujitsu
+++ b/xorg-server/xkeyboard-config/keycodes/fujitsu
diff --git a/xorg-server/xkbdata.src/keycodes/hp b/xorg-server/xkeyboard-config/keycodes/hp
index 0c98072d3..0c98072d3 100644
--- a/xorg-server/xkbdata.src/keycodes/hp
+++ b/xorg-server/xkeyboard-config/keycodes/hp
diff --git a/xorg-server/xkbdata.src/keycodes/ibm b/xorg-server/xkeyboard-config/keycodes/ibm
index 303d4b360..303d4b360 100644
--- a/xorg-server/xkbdata.src/keycodes/ibm
+++ b/xorg-server/xkeyboard-config/keycodes/ibm
diff --git a/xorg-server/xkbdata.src/keycodes/macintosh b/xorg-server/xkeyboard-config/keycodes/macintosh
index 5b0a2614a..5b0a2614a 100644
--- a/xorg-server/xkbdata.src/keycodes/macintosh
+++ b/xorg-server/xkeyboard-config/keycodes/macintosh
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
index f601268e2..f601268e2 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
index 6605ade53..6605ade53 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
index e16a0cbc1..e16a0cbc1 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/iris b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
index a4118a6b4..a4118a6b4 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/iris
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
diff --git a/xorg-server/xkbdata.src/keycodes/sony b/xorg-server/xkeyboard-config/keycodes/sony
index 0e720b422..0e720b422 100644
--- a/xorg-server/xkbdata.src/keycodes/sony
+++ b/xorg-server/xkeyboard-config/keycodes/sony
diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkeyboard-config/keycodes/sun
index a6ffdb39f..a6ffdb39f 100644
--- a/xorg-server/xkbdata.src/keycodes/sun
+++ b/xorg-server/xkeyboard-config/keycodes/sun
diff --git a/xorg-server/xkbdata.src/keycodes/xfree86 b/xorg-server/xkeyboard-config/keycodes/xfree86
index bf91fa8ff..bf91fa8ff 100644
--- a/xorg-server/xkbdata.src/keycodes/xfree86
+++ b/xorg-server/xkeyboard-config/keycodes/xfree86
diff --git a/xorg-server/xkbdata.src/keycodes/xfree98 b/xorg-server/xkeyboard-config/keycodes/xfree98
index 59483caf3..59483caf3 100644
--- a/xorg-server/xkbdata.src/keycodes/xfree98
+++ b/xorg-server/xkeyboard-config/keycodes/xfree98
diff --git a/xorg-server/xkbdata.src/keymap/Makefile.am b/xorg-server/xkeyboard-config/keymap/Makefile.am
index 98da8f2b0..98da8f2b0 100644
--- a/xorg-server/xkbdata.src/keymap/Makefile.am
+++ b/xorg-server/xkeyboard-config/keymap/Makefile.am
diff --git a/xorg-server/xkbdata.src/keymap/README b/xorg-server/xkeyboard-config/keymap/README
index 318089e09..318089e09 100644
--- a/xorg-server/xkbdata.src/keymap/README
+++ b/xorg-server/xkeyboard-config/keymap/README
diff --git a/xorg-server/xkbdata.src/keymap/amiga b/xorg-server/xkeyboard-config/keymap/amiga
index d697a986b..d697a986b 100644
--- a/xorg-server/xkbdata.src/keymap/amiga
+++ b/xorg-server/xkeyboard-config/keymap/amiga
diff --git a/xorg-server/xkbdata.src/keymap/ataritt b/xorg-server/xkeyboard-config/keymap/ataritt
index b801ac291..b801ac291 100644
--- a/xorg-server/xkbdata.src/keymap/ataritt
+++ b/xorg-server/xkeyboard-config/keymap/ataritt
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/digital_vndr/Makefile.am
index b1961e5b1..b1961e5b1 100644
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keymap/digital_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/us b/xorg-server/xkeyboard-config/keymap/digital_vndr/us
index 7f5180e2c..7f5180e2c 100644
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/digital_vndr/us
diff --git a/xorg-server/xkbdata.src/keymap/macintosh b/xorg-server/xkeyboard-config/keymap/macintosh
index de115badc..de115badc 100644
--- a/xorg-server/xkbdata.src/keymap/macintosh
+++ b/xorg-server/xkeyboard-config/keymap/macintosh
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
index 234a336db..234a336db 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/be b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
index 9905f0ba6..9905f0ba6 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/be
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
index a3cb08a22..a3cb08a22 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
index 38f489657..38f489657 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
index 6970a3679..6970a3679 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
index 6673b615b..6673b615b 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/de b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
index 1ad7fe7b0..1ad7fe7b0 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
index 832f01da7..832f01da7 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
index bd594b0eb..bd594b0eb 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
index 29f1666b7..29f1666b7 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/es b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
index f1aad9a7a..f1aad9a7a 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
index 67af07eb7..67af07eb7 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
index b6aea29de..b6aea29de 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
index 6fa6d6515..6fa6d6515 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
index 3c256846e..3c256846e 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/it b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
index ed92227b7..ed92227b7 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/it
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
index 74ed4243c..74ed4243c 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/no b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
index fd32c72c0..fd32c72c0 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
index 3641a31ad..3641a31ad 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
index 3ec03471a..3ec03471a 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
index fc514d87c..fc514d87c 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/se b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
index 910a8cc89..910a8cc89 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
index 09b6a2956..09b6a2956 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/th b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
index aa03c8c11..aa03c8c11 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/th
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/us b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
index 5850145ca..5850145ca 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
diff --git a/xorg-server/xkbdata.src/keymap/sony b/xorg-server/xkeyboard-config/keymap/sony
index c4be3b1b8..c4be3b1b8 100644
--- a/xorg-server/xkbdata.src/keymap/sony
+++ b/xorg-server/xkeyboard-config/keymap/sony
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/sun_vndr/Makefile.am
index 551162d3e..551162d3e 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/all b/xorg-server/xkeyboard-config/keymap/sun_vndr/all
index 047ae7bc4..047ae7bc4 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/all
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/all
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/de b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
index 4c1ded3fc..4c1ded3fc 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/es b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
index 2de81c011..2de81c011 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fi b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
index 296ef66c4..296ef66c4 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fr b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
index 9301ce031..9301ce031 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/no b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
index 45669237e..45669237e 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/pl b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
index 904ffb2d7..904ffb2d7 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/ru b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
index fc7d75b1e..fc7d75b1e 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/se b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
index fad7009e4..fad7009e4 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/uk b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
index e1fb4970b..e1fb4970b 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/uk
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/us b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
index 397482f84..397482f84 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkeyboard-config/keymap/xfree86
index 8686f78d8..8686f78d8 100644
--- a/xorg-server/xkbdata.src/keymap/xfree86
+++ b/xorg-server/xkeyboard-config/keymap/xfree86
diff --git a/xorg-server/xkbdata.src/keymap/xfree98 b/xorg-server/xkeyboard-config/keymap/xfree98
index b344eedbc..b344eedbc 100644
--- a/xorg-server/xkbdata.src/keymap/xfree98
+++ b/xorg-server/xkeyboard-config/keymap/xfree98
diff --git a/xorg-server/xkbdata.src/po/ChangeLog b/xorg-server/xkeyboard-config/po/ChangeLog
index 254a4768f..254a4768f 100644
--- a/xorg-server/xkbdata.src/po/ChangeLog
+++ b/xorg-server/xkeyboard-config/po/ChangeLog
diff --git a/xorg-server/xkbdata.src/po/Makevars b/xorg-server/xkeyboard-config/po/Makevars
index 03f092c96..03f092c96 100644
--- a/xorg-server/xkbdata.src/po/Makevars
+++ b/xorg-server/xkeyboard-config/po/Makevars
diff --git a/xorg-server/xkbdata.src/po/POTFILES.in b/xorg-server/xkeyboard-config/po/POTFILES.in
index 901d327d4..901d327d4 100644
--- a/xorg-server/xkbdata.src/po/POTFILES.in
+++ b/xorg-server/xkeyboard-config/po/POTFILES.in
diff --git a/xorg-server/xkbdata.src/po/POTFILES.skip b/xorg-server/xkeyboard-config/po/POTFILES.skip
index 67c1092e1..67c1092e1 100644
--- a/xorg-server/xkbdata.src/po/POTFILES.skip
+++ b/xorg-server/xkeyboard-config/po/POTFILES.skip
diff --git a/xorg-server/xkbdata.src/po/af.po b/xorg-server/xkeyboard-config/po/af.po
index e2c453d11..e2c453d11 100644
--- a/xorg-server/xkbdata.src/po/af.po
+++ b/xorg-server/xkeyboard-config/po/af.po
diff --git a/xorg-server/xkbdata.src/po/az.po b/xorg-server/xkeyboard-config/po/az.po
index d15d1bf64..d15d1bf64 100644
--- a/xorg-server/xkbdata.src/po/az.po
+++ b/xorg-server/xkeyboard-config/po/az.po
diff --git a/xorg-server/xkbdata.src/po/bg.po b/xorg-server/xkeyboard-config/po/bg.po
index 9e149e6ac..9e149e6ac 100644
--- a/xorg-server/xkbdata.src/po/bg.po
+++ b/xorg-server/xkeyboard-config/po/bg.po
diff --git a/xorg-server/xkbdata.src/po/ca.po b/xorg-server/xkeyboard-config/po/ca.po
index 0d641be35..0d641be35 100644
--- a/xorg-server/xkbdata.src/po/ca.po
+++ b/xorg-server/xkeyboard-config/po/ca.po
diff --git a/xorg-server/xkbdata.src/po/crh.po b/xorg-server/xkeyboard-config/po/crh.po
index 8639c7f46..8639c7f46 100644
--- a/xorg-server/xkbdata.src/po/crh.po
+++ b/xorg-server/xkeyboard-config/po/crh.po
diff --git a/xorg-server/xkbdata.src/po/cs.po b/xorg-server/xkeyboard-config/po/cs.po
index 82ec5b3cd..82ec5b3cd 100644
--- a/xorg-server/xkbdata.src/po/cs.po
+++ b/xorg-server/xkeyboard-config/po/cs.po
diff --git a/xorg-server/xkbdata.src/po/da.po b/xorg-server/xkeyboard-config/po/da.po
index 8226fef64..8226fef64 100644
--- a/xorg-server/xkbdata.src/po/da.po
+++ b/xorg-server/xkeyboard-config/po/da.po
diff --git a/xorg-server/xkbdata.src/po/de.po b/xorg-server/xkeyboard-config/po/de.po
index 34c9a8ba2..34c9a8ba2 100644
--- a/xorg-server/xkbdata.src/po/de.po
+++ b/xorg-server/xkeyboard-config/po/de.po
diff --git a/xorg-server/xkbdata.src/po/el.po b/xorg-server/xkeyboard-config/po/el.po
index 401e66f73..401e66f73 100644
--- a/xorg-server/xkbdata.src/po/el.po
+++ b/xorg-server/xkeyboard-config/po/el.po
diff --git a/xorg-server/xkbdata.src/po/en_GB.po b/xorg-server/xkeyboard-config/po/en_GB.po
index 48af18093..48af18093 100644
--- a/xorg-server/xkbdata.src/po/en_GB.po
+++ b/xorg-server/xkeyboard-config/po/en_GB.po
diff --git a/xorg-server/xkbdata.src/po/eo.po b/xorg-server/xkeyboard-config/po/eo.po
index 26c262000..26c262000 100644
--- a/xorg-server/xkbdata.src/po/eo.po
+++ b/xorg-server/xkeyboard-config/po/eo.po
diff --git a/xorg-server/xkbdata.src/po/es.po b/xorg-server/xkeyboard-config/po/es.po
index c8b4594ae..c8b4594ae 100644
--- a/xorg-server/xkbdata.src/po/es.po
+++ b/xorg-server/xkeyboard-config/po/es.po
diff --git a/xorg-server/xkbdata.src/po/fi.po b/xorg-server/xkeyboard-config/po/fi.po
index 461485e2e..461485e2e 100644
--- a/xorg-server/xkbdata.src/po/fi.po
+++ b/xorg-server/xkeyboard-config/po/fi.po
diff --git a/xorg-server/xkbdata.src/po/fr.po b/xorg-server/xkeyboard-config/po/fr.po
index 42929600a..42929600a 100644
--- a/xorg-server/xkbdata.src/po/fr.po
+++ b/xorg-server/xkeyboard-config/po/fr.po
diff --git a/xorg-server/xkbdata.src/po/hu.po b/xorg-server/xkeyboard-config/po/hu.po
index 5f3c35ce4..5f3c35ce4 100644
--- a/xorg-server/xkbdata.src/po/hu.po
+++ b/xorg-server/xkeyboard-config/po/hu.po
diff --git a/xorg-server/xkbdata.src/po/id.po b/xorg-server/xkeyboard-config/po/id.po
index f37661499..f37661499 100644
--- a/xorg-server/xkbdata.src/po/id.po
+++ b/xorg-server/xkeyboard-config/po/id.po
diff --git a/xorg-server/xkbdata.src/po/it.po b/xorg-server/xkeyboard-config/po/it.po
index e4601c000..e4601c000 100644
--- a/xorg-server/xkbdata.src/po/it.po
+++ b/xorg-server/xkeyboard-config/po/it.po
diff --git a/xorg-server/xkbdata.src/po/ka.po b/xorg-server/xkeyboard-config/po/ka.po
index f1dad4d71..f1dad4d71 100644
--- a/xorg-server/xkbdata.src/po/ka.po
+++ b/xorg-server/xkeyboard-config/po/ka.po
diff --git a/xorg-server/xkbdata.src/po/ko.po b/xorg-server/xkeyboard-config/po/ko.po
index 1c70b3f2d..1c70b3f2d 100644
--- a/xorg-server/xkbdata.src/po/ko.po
+++ b/xorg-server/xkeyboard-config/po/ko.po
diff --git a/xorg-server/xkbdata.src/po/ky.po b/xorg-server/xkeyboard-config/po/ky.po
index b08ebf695..b08ebf695 100644
--- a/xorg-server/xkbdata.src/po/ky.po
+++ b/xorg-server/xkeyboard-config/po/ky.po
diff --git a/xorg-server/xkbdata.src/po/lt.po b/xorg-server/xkeyboard-config/po/lt.po
index d8351cae2..d8351cae2 100644
--- a/xorg-server/xkbdata.src/po/lt.po
+++ b/xorg-server/xkeyboard-config/po/lt.po
diff --git a/xorg-server/xkbdata.src/po/nb.po b/xorg-server/xkeyboard-config/po/nb.po
index ce3b94416..ce3b94416 100644
--- a/xorg-server/xkbdata.src/po/nb.po
+++ b/xorg-server/xkeyboard-config/po/nb.po
diff --git a/xorg-server/xkbdata.src/po/nl.po b/xorg-server/xkeyboard-config/po/nl.po
index 4bc4f8179..4bc4f8179 100644
--- a/xorg-server/xkbdata.src/po/nl.po
+++ b/xorg-server/xkeyboard-config/po/nl.po
diff --git a/xorg-server/xkbdata.src/po/pl.po b/xorg-server/xkeyboard-config/po/pl.po
index 1b477879f..1b477879f 100644
--- a/xorg-server/xkbdata.src/po/pl.po
+++ b/xorg-server/xkeyboard-config/po/pl.po
diff --git a/xorg-server/xkbdata.src/po/ru.po b/xorg-server/xkeyboard-config/po/ru.po
index d3e6cc5a3..d3e6cc5a3 100644
--- a/xorg-server/xkbdata.src/po/ru.po
+++ b/xorg-server/xkeyboard-config/po/ru.po
diff --git a/xorg-server/xkbdata.src/po/rw.po b/xorg-server/xkeyboard-config/po/rw.po
index 935d6c33e..935d6c33e 100644
--- a/xorg-server/xkbdata.src/po/rw.po
+++ b/xorg-server/xkeyboard-config/po/rw.po
diff --git a/xorg-server/xkbdata.src/po/sk.po b/xorg-server/xkeyboard-config/po/sk.po
index fe53d5b61..fe53d5b61 100644
--- a/xorg-server/xkbdata.src/po/sk.po
+++ b/xorg-server/xkeyboard-config/po/sk.po
diff --git a/xorg-server/xkbdata.src/po/sl.po b/xorg-server/xkeyboard-config/po/sl.po
index 1a5c4e018..1a5c4e018 100644
--- a/xorg-server/xkbdata.src/po/sl.po
+++ b/xorg-server/xkeyboard-config/po/sl.po
diff --git a/xorg-server/xkbdata.src/po/sq.po b/xorg-server/xkeyboard-config/po/sq.po
index 4efec73dc..4efec73dc 100644
--- a/xorg-server/xkbdata.src/po/sq.po
+++ b/xorg-server/xkeyboard-config/po/sq.po
diff --git a/xorg-server/xkbdata.src/po/sr.po b/xorg-server/xkeyboard-config/po/sr.po
index d4ed4a5f3..d4ed4a5f3 100644
--- a/xorg-server/xkbdata.src/po/sr.po
+++ b/xorg-server/xkeyboard-config/po/sr.po
diff --git a/xorg-server/xkbdata.src/po/sv.po b/xorg-server/xkeyboard-config/po/sv.po
index 2fbb1517b..2fbb1517b 100644
--- a/xorg-server/xkbdata.src/po/sv.po
+++ b/xorg-server/xkeyboard-config/po/sv.po
diff --git a/xorg-server/xkbdata.src/po/tr.po b/xorg-server/xkeyboard-config/po/tr.po
index 8f68328b8..8f68328b8 100644
--- a/xorg-server/xkbdata.src/po/tr.po
+++ b/xorg-server/xkeyboard-config/po/tr.po
diff --git a/xorg-server/xkbdata.src/po/uk.po b/xorg-server/xkeyboard-config/po/uk.po
index f1acb56ad..f1acb56ad 100644
--- a/xorg-server/xkbdata.src/po/uk.po
+++ b/xorg-server/xkeyboard-config/po/uk.po
diff --git a/xorg-server/xkbdata.src/po/vi.po b/xorg-server/xkeyboard-config/po/vi.po
index 01a2f87d2..01a2f87d2 100644
--- a/xorg-server/xkbdata.src/po/vi.po
+++ b/xorg-server/xkeyboard-config/po/vi.po
diff --git a/xorg-server/xkbdata.src/po/xkeyboard-config.pot b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
index 0f9e97276..0f9e97276 100644
--- a/xorg-server/xkbdata.src/po/xkeyboard-config.pot
+++ b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
diff --git a/xorg-server/xkbdata.src/po/zh_CN.po b/xorg-server/xkeyboard-config/po/zh_CN.po
index cacbf435c..cacbf435c 100644
--- a/xorg-server/xkbdata.src/po/zh_CN.po
+++ b/xorg-server/xkeyboard-config/po/zh_CN.po
diff --git a/xorg-server/xkbdata.src/po/zh_TW.po b/xorg-server/xkeyboard-config/po/zh_TW.po
index 383e01e3f..383e01e3f 100644
--- a/xorg-server/xkbdata.src/po/zh_TW.po
+++ b/xorg-server/xkeyboard-config/po/zh_TW.po
diff --git a/xorg-server/xkbdata.src/rules/HDR b/xorg-server/xkeyboard-config/rules/HDR
index 769b8fc7f..769b8fc7f 100644
--- a/xorg-server/xkbdata.src/rules/HDR
+++ b/xorg-server/xkeyboard-config/rules/HDR
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index 6ca04e7fa..6ca04e7fa 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
diff --git a/xorg-server/xkbdata.src/rules/README b/xorg-server/xkeyboard-config/rules/README
index bcf19ce0c..bcf19ce0c 100644
--- a/xorg-server/xkbdata.src/rules/README
+++ b/xorg-server/xkeyboard-config/rules/README
diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index a17205e54..a17205e54 100644
--- a/xorg-server/xkbdata.src/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
diff --git a/xorg-server/xkbdata.src/rules/base.hdr.part b/xorg-server/xkeyboard-config/rules/base.hdr.part
index d867c8876..d867c8876 100644
--- a/xorg-server/xkbdata.src/rules/base.hdr.part
+++ b/xorg-server/xkeyboard-config/rules/base.hdr.part
diff --git a/xorg-server/xkbdata.src/rules/base.l1_k.part b/xorg-server/xkeyboard-config/rules/base.l1_k.part
index 91b775396..91b775396 100644
--- a/xorg-server/xkbdata.src/rules/base.l1_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1_k.part
diff --git a/xorg-server/xkbdata.src/rules/base.l1o_s.part b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
index 592fab272..592fab272 100644
--- a/xorg-server/xkbdata.src/rules/base.l1o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.l2o_s.part b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
index aac680e9d..aac680e9d 100644
--- a/xorg-server/xkbdata.src/rules/base.l2o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.l3o_s.part b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
index 1010e2e03..1010e2e03 100644
--- a/xorg-server/xkbdata.src/rules/base.l3o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.l4o_s.part b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
index 49650ad9c..49650ad9c 100644
--- a/xorg-server/xkbdata.src/rules/base.l4o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.l_k.part b/xorg-server/xkeyboard-config/rules/base.l_k.part
index 91b775396..91b775396 100644
--- a/xorg-server/xkbdata.src/rules/base.l_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l_k.part
diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part
index 4cf47331a..4cf47331a 100644
--- a/xorg-server/xkbdata.src/rules/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/base.lists.part
diff --git a/xorg-server/xkbdata.src/rules/base.lo_s.part b/xorg-server/xkeyboard-config/rules/base.lo_s.part
index dee7b6daa..dee7b6daa 100644
--- a/xorg-server/xkbdata.src/rules/base.lo_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.lo_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkeyboard-config/rules/base.m_g.part
index eab19eb9d..eab19eb9d 100644
--- a/xorg-server/xkbdata.src/rules/base.m_g.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_g.part
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkeyboard-config/rules/base.m_k.part
index 2c621208f..2c621208f 100644
--- a/xorg-server/xkbdata.src/rules/base.m_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_k.part
diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkeyboard-config/rules/base.m_s.part
index 4bbbcce31..4bbbcce31 100644
--- a/xorg-server/xkbdata.src/rules/base.m_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.m_t.part b/xorg-server/xkeyboard-config/rules/base.m_t.part
index 7ccbf47b9..7ccbf47b9 100644
--- a/xorg-server/xkbdata.src/rules/base.m_t.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_t.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_c.part b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
index f59e596d5..f59e596d5 100644
--- a/xorg-server/xkbdata.src/rules/base.ml1_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkeyboard-config/rules/base.ml1_s.part
index efe8ae124..efe8ae124 100644
--- a/xorg-server/xkbdata.src/rules/base.ml1_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml1_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml2_s.part b/xorg-server/xkeyboard-config/rules/base.ml2_s.part
index 3c80545d5..3c80545d5 100644
--- a/xorg-server/xkbdata.src/rules/base.ml2_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml2_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml3_s.part b/xorg-server/xkeyboard-config/rules/base.ml3_s.part
index b7e669f87..b7e669f87 100644
--- a/xorg-server/xkbdata.src/rules/base.ml3_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml3_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml4_s.part b/xorg-server/xkeyboard-config/rules/base.ml4_s.part
index d8830ae34..d8830ae34 100644
--- a/xorg-server/xkbdata.src/rules/base.ml4_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml4_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml_c.part b/xorg-server/xkeyboard-config/rules/base.ml_c.part
index ec8f02291..ec8f02291 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_c.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml_g.part b/xorg-server/xkeyboard-config/rules/base.ml_g.part
index e66bb0b50..e66bb0b50 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_g.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_g.part
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkeyboard-config/rules/base.ml_s.part
index d59c54f26..d59c54f26 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.mlv_s.part b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
index 1eecc55c0..1eecc55c0 100644
--- a/xorg-server/xkbdata.src/rules/base.mlv_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.o_c.part b/xorg-server/xkeyboard-config/rules/base.o_c.part
index 352f8b363..352f8b363 100644
--- a/xorg-server/xkbdata.src/rules/base.o_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_c.part
diff --git a/xorg-server/xkbdata.src/rules/base.o_k.part b/xorg-server/xkeyboard-config/rules/base.o_k.part
index e69de29bb..e69de29bb 100644
--- a/xorg-server/xkbdata.src/rules/base.o_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_k.part
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index f8f5e5421..f8f5e5421 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
diff --git a/xorg-server/xkbdata.src/rules/base.o_t.part b/xorg-server/xkeyboard-config/rules/base.o_t.part
index e0d4b15ed..e0d4b15ed 100644
--- a/xorg-server/xkbdata.src/rules/base.o_t.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_t.part
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 84fd69339..84fd69339 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkeyboard-config/rules/bin/Makefile.am
index 787e34f8a..787e34f8a 100644
--- a/xorg-server/xkbdata.src/rules/bin/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/bin/Makefile.am
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
index b2d222432..b2d222432 100644
--- a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
index 7c2b1a84c..7c2b1a84c 100644
--- a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
index 084d4c0be..084d4c0be 100644
--- a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
index 666ba870f..666ba870f 100644
--- a/xorg-server/xkbdata.src/rules/bin/ml_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/mln_s.sh b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
index 4a615fe7d..4a615fe7d 100644
--- a/xorg-server/xkbdata.src/rules/bin/mln_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
index 30123874b..30123874b 100644
--- a/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
diff --git a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
index 5b466d59c..5b466d59c 100644
--- a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
index 087263427..087263427 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
diff --git a/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
index 64ff0f2f5..64ff0f2f5 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
index fea61be76..fea61be76 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
index 5a1fb2f8a..5a1fb2f8a 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
index ac8a91102..ac8a91102 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.lists.part b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
index f1cf7ee22..f1cf7ee22 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
index 64ff0f2f5..64ff0f2f5 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.lv_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
diff --git a/xorg-server/xkbdata.src/rules/compat/base.o_s.part b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
index 8f1e9e452..8f1e9e452 100644
--- a/xorg-server/xkbdata.src/rules/compat/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
diff --git a/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
index cecda6d8a..cecda6d8a 100644
--- a/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
index be2a2bc40..be2a2bc40 100644
--- a/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_k.part b/xorg-server/xkeyboard-config/rules/evdev.m_k.part
index 4f1c5c30a..4f1c5c30a 100644
--- a/xorg-server/xkbdata.src/rules/evdev.m_k.part
+++ b/xorg-server/xkeyboard-config/rules/evdev.m_k.part
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkeyboard-config/rules/evdev.m_s.part
index 1b423053c..1b423053c 100644
--- a/xorg-server/xkbdata.src/rules/evdev.m_s.part
+++ b/xorg-server/xkeyboard-config/rules/evdev.m_s.part
diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
index 16119a3f0..16119a3f0 100644
--- a/xorg-server/xkbdata.src/rules/extras/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
diff --git a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
index d75b4f44d..d75b4f44d 100644
--- a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
index 36af488d1..36af488d1 100644
--- a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkeyboard-config/rules/merge.sh
index b18af7c3d..b18af7c3d 100644
--- a/xorg-server/xkbdata.src/rules/merge.sh
+++ b/xorg-server/xkeyboard-config/rules/merge.sh
diff --git a/xorg-server/xkbdata.src/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98
index ca7a18bf7..ca7a18bf7 100644
--- a/xorg-server/xkbdata.src/rules/xfree98
+++ b/xorg-server/xkeyboard-config/rules/xfree98
diff --git a/xorg-server/xkbdata.src/rules/xkb.dtd b/xorg-server/xkeyboard-config/rules/xkb.dtd
index 4452712fd..4452712fd 100644
--- a/xorg-server/xkbdata.src/rules/xkb.dtd
+++ b/xorg-server/xkeyboard-config/rules/xkb.dtd
diff --git a/xorg-server/xkbdata.src/rules/xml2lst.pl b/xorg-server/xkeyboard-config/rules/xml2lst.pl
index 478fce89c..478fce89c 100644
--- a/xorg-server/xkbdata.src/rules/xml2lst.pl
+++ b/xorg-server/xkeyboard-config/rules/xml2lst.pl
diff --git a/xorg-server/xkbdata.src/semantics/Makefile.am b/xorg-server/xkeyboard-config/semantics/Makefile.am
index 9e92daaca..9e92daaca 100644
--- a/xorg-server/xkbdata.src/semantics/Makefile.am
+++ b/xorg-server/xkeyboard-config/semantics/Makefile.am
diff --git a/xorg-server/xkbdata.src/semantics/basic b/xorg-server/xkeyboard-config/semantics/basic
index 014e9ca68..014e9ca68 100644
--- a/xorg-server/xkbdata.src/semantics/basic
+++ b/xorg-server/xkeyboard-config/semantics/basic
diff --git a/xorg-server/xkbdata.src/semantics/complete b/xorg-server/xkeyboard-config/semantics/complete
index df1632e29..df1632e29 100644
--- a/xorg-server/xkbdata.src/semantics/complete
+++ b/xorg-server/xkeyboard-config/semantics/complete
diff --git a/xorg-server/xkbdata.src/semantics/default b/xorg-server/xkeyboard-config/semantics/default
index 42e755e3c..42e755e3c 100644
--- a/xorg-server/xkbdata.src/semantics/default
+++ b/xorg-server/xkeyboard-config/semantics/default
diff --git a/xorg-server/xkbdata.src/semantics/xtest b/xorg-server/xkeyboard-config/semantics/xtest
index d221fe5b4..d221fe5b4 100644
--- a/xorg-server/xkbdata.src/semantics/xtest
+++ b/xorg-server/xkeyboard-config/semantics/xtest
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index fc618a4b9..fc618a4b9 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/ad b/xorg-server/xkeyboard-config/symbols/ad
index 3836ca34d..3836ca34d 100644
--- a/xorg-server/xkbdata.src/symbols/ad
+++ b/xorg-server/xkeyboard-config/symbols/ad
diff --git a/xorg-server/xkbdata.src/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index d8a88526a..d8a88526a 100644
--- a/xorg-server/xkbdata.src/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
diff --git a/xorg-server/xkbdata.src/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index 18f11139e..18f11139e 100644
--- a/xorg-server/xkbdata.src/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin
index 4463fe06c..4463fe06c 100644
--- a/xorg-server/xkbdata.src/symbols/altwin
+++ b/xorg-server/xkeyboard-config/symbols/altwin
diff --git a/xorg-server/xkbdata.src/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index 6fe84836c..6fe84836c 100644
--- a/xorg-server/xkbdata.src/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 90a584475..90a584475 100644
--- a/xorg-server/xkbdata.src/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
diff --git a/xorg-server/xkbdata.src/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index 254cf7f8c..254cf7f8c 100644
--- a/xorg-server/xkbdata.src/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
diff --git a/xorg-server/xkbdata.src/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba
index 68a887a94..68a887a94 100644
--- a/xorg-server/xkbdata.src/symbols/ba
+++ b/xorg-server/xkeyboard-config/symbols/ba
diff --git a/xorg-server/xkbdata.src/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd
index 1f622e9fd..1f622e9fd 100644
--- a/xorg-server/xkbdata.src/symbols/bd
+++ b/xorg-server/xkeyboard-config/symbols/bd
diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index 040f1b42e..040f1b42e 100644
--- a/xorg-server/xkbdata.src/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index d10204e8e..d10204e8e 100644
--- a/xorg-server/xkbdata.src/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
diff --git a/xorg-server/xkbdata.src/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index f9f5cbe5e..f9f5cbe5e 100644
--- a/xorg-server/xkbdata.src/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
diff --git a/xorg-server/xkbdata.src/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai
index e89bed24f..e89bed24f 100644
--- a/xorg-server/xkbdata.src/symbols/brai
+++ b/xorg-server/xkeyboard-config/symbols/brai
diff --git a/xorg-server/xkbdata.src/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt
index d87558371..d87558371 100644
--- a/xorg-server/xkbdata.src/symbols/bt
+++ b/xorg-server/xkeyboard-config/symbols/bt
diff --git a/xorg-server/xkbdata.src/symbols/bw b/xorg-server/xkeyboard-config/symbols/bw
index ea5079e5d..ea5079e5d 100644
--- a/xorg-server/xkbdata.src/symbols/bw
+++ b/xorg-server/xkeyboard-config/symbols/bw
diff --git a/xorg-server/xkbdata.src/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 4409e52dd..4409e52dd 100644
--- a/xorg-server/xkbdata.src/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca
index 63f9e48e6..63f9e48e6 100644
--- a/xorg-server/xkbdata.src/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 415e4db1d..415e4db1d 100644
--- a/xorg-server/xkbdata.src/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
diff --git a/xorg-server/xkbdata.src/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd
index 1ba036551..1ba036551 100644
--- a/xorg-server/xkbdata.src/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd
diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch
index 26dcb616f..26dcb616f 100644
--- a/xorg-server/xkbdata.src/symbols/ch
+++ b/xorg-server/xkeyboard-config/symbols/ch
diff --git a/xorg-server/xkbdata.src/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index c3dfc94b2..c3dfc94b2 100644
--- a/xorg-server/xkbdata.src/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose
index 84e1a4b04..84e1a4b04 100644
--- a/xorg-server/xkbdata.src/symbols/compose
+++ b/xorg-server/xkeyboard-config/symbols/compose
diff --git a/xorg-server/xkbdata.src/symbols/ctrl b/xorg-server/xkeyboard-config/symbols/ctrl
index 80930bc12..80930bc12 100644
--- a/xorg-server/xkbdata.src/symbols/ctrl
+++ b/xorg-server/xkeyboard-config/symbols/ctrl
diff --git a/xorg-server/xkbdata.src/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index 32592799a..32592799a 100644
--- a/xorg-server/xkbdata.src/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index d70bccd5d..d70bccd5d 100644
--- a/xorg-server/xkbdata.src/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
index 063fc8d57..063fc8d57 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
index 4d311c7e5..4d311c7e5 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/pc b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
index b1faec03c..b1faec03c 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/us b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
index 7e1131a63..7e1131a63 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/vt b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
index 483f1debe..483f1debe 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/vt
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
diff --git a/xorg-server/xkbdata.src/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index 16223e9a5..16223e9a5 100644
--- a/xorg-server/xkbdata.src/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
diff --git a/xorg-server/xkbdata.src/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index e55f20e27..e55f20e27 100644
--- a/xorg-server/xkbdata.src/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
diff --git a/xorg-server/xkbdata.src/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty
index f315260ce..f315260ce 100644
--- a/xorg-server/xkbdata.src/symbols/empty
+++ b/xorg-server/xkeyboard-config/symbols/empty
diff --git a/xorg-server/xkbdata.src/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo
index c9b2d57b2..c9b2d57b2 100644
--- a/xorg-server/xkbdata.src/symbols/epo
+++ b/xorg-server/xkeyboard-config/symbols/epo
diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 70f8088a8..70f8088a8 100644
--- a/xorg-server/xkbdata.src/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
diff --git a/xorg-server/xkbdata.src/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index f3d4a98db..f3d4a98db 100644
--- a/xorg-server/xkbdata.src/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
diff --git a/xorg-server/xkbdata.src/symbols/eurosign b/xorg-server/xkeyboard-config/symbols/eurosign
index 9458cea33..9458cea33 100644
--- a/xorg-server/xkbdata.src/symbols/eurosign
+++ b/xorg-server/xkeyboard-config/symbols/eurosign
diff --git a/xorg-server/xkbdata.src/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
index fb128fd19..fb128fd19 100644
--- a/xorg-server/xkbdata.src/symbols/extractGroupNames.sh
+++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.am b/xorg-server/xkeyboard-config/symbols/extras/Makefile.am
index 7410ac24f..7410ac24f 100644
--- a/xorg-server/xkbdata.src/symbols/extras/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/extras/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/extras/apl b/xorg-server/xkeyboard-config/symbols/extras/apl
index 512277a75..512277a75 100644
--- a/xorg-server/xkbdata.src/symbols/extras/apl
+++ b/xorg-server/xkeyboard-config/symbols/extras/apl
diff --git a/xorg-server/xkbdata.src/symbols/extras/ir b/xorg-server/xkeyboard-config/symbols/extras/ir
index 52502bf75..52502bf75 100644
--- a/xorg-server/xkbdata.src/symbols/extras/ir
+++ b/xorg-server/xkeyboard-config/symbols/extras/ir
diff --git a/xorg-server/xkbdata.src/symbols/extras/rs b/xorg-server/xkeyboard-config/symbols/extras/rs
index cc6b5fb44..cc6b5fb44 100644
--- a/xorg-server/xkbdata.src/symbols/extras/rs
+++ b/xorg-server/xkeyboard-config/symbols/extras/rs
diff --git a/xorg-server/xkbdata.src/symbols/extras/us b/xorg-server/xkeyboard-config/symbols/extras/us
index b58932c6a..b58932c6a 100644
--- a/xorg-server/xkbdata.src/symbols/extras/us
+++ b/xorg-server/xkeyboard-config/symbols/extras/us
diff --git a/xorg-server/xkbdata.src/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 78dd91934..78dd91934 100644
--- a/xorg-server/xkbdata.src/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
diff --git a/xorg-server/xkbdata.src/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index 5ac205560..5ac205560 100644
--- a/xorg-server/xkbdata.src/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
diff --git a/xorg-server/xkbdata.src/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 37038bee4..37038bee4 100644
--- a/xorg-server/xkbdata.src/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
index 4e3a96ee1..4e3a96ee1 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
index 2f49dea76..2f49dea76 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
index e81be028d..e81be028d 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb
index f7e5bbe66..f7e5bbe66 100644
--- a/xorg-server/xkbdata.src/symbols/gb
+++ b/xorg-server/xkeyboard-config/symbols/gb
diff --git a/xorg-server/xkbdata.src/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index 155a9da66..155a9da66 100644
--- a/xorg-server/xkbdata.src/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
diff --git a/xorg-server/xkbdata.src/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh
index a997e9fb0..a997e9fb0 100644
--- a/xorg-server/xkbdata.src/symbols/gh
+++ b/xorg-server/xkeyboard-config/symbols/gh
diff --git a/xorg-server/xkbdata.src/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn
index fb47bfe4b..fb47bfe4b 100644
--- a/xorg-server/xkbdata.src/symbols/gn
+++ b/xorg-server/xkeyboard-config/symbols/gn
diff --git a/xorg-server/xkbdata.src/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr
index 4ededb3ff..4ededb3ff 100644
--- a/xorg-server/xkbdata.src/symbols/gr
+++ b/xorg-server/xkeyboard-config/symbols/gr
diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkeyboard-config/symbols/group
index f39b05159..f39b05159 100644
--- a/xorg-server/xkbdata.src/symbols/group
+++ b/xorg-server/xkeyboard-config/symbols/group
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
index 6bcd4da3e..6bcd4da3e 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
index 18ce8aeae..18ce8aeae 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 61c6eae18..61c6eae18 100644
--- a/xorg-server/xkbdata.src/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
diff --git a/xorg-server/xkbdata.src/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu
index 9e97740fa..9e97740fa 100644
--- a/xorg-server/xkbdata.src/symbols/hu
+++ b/xorg-server/xkeyboard-config/symbols/hu
diff --git a/xorg-server/xkbdata.src/symbols/ie b/xorg-server/xkeyboard-config/symbols/ie
index 22d857247..22d857247 100644
--- a/xorg-server/xkbdata.src/symbols/ie
+++ b/xorg-server/xkeyboard-config/symbols/ie
diff --git a/xorg-server/xkbdata.src/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index cc29b128e..cc29b128e 100644
--- a/xorg-server/xkbdata.src/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index e9ad77b84..e9ad77b84 100644
--- a/xorg-server/xkbdata.src/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 0fd549f76..0fd549f76 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
diff --git a/xorg-server/xkbdata.src/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq
index b2b742b95..b2b742b95 100644
--- a/xorg-server/xkbdata.src/symbols/iq
+++ b/xorg-server/xkeyboard-config/symbols/iq
diff --git a/xorg-server/xkbdata.src/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 7ee3bc731..7ee3bc731 100644
--- a/xorg-server/xkbdata.src/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
diff --git a/xorg-server/xkbdata.src/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index 53dddc43e..53dddc43e 100644
--- a/xorg-server/xkbdata.src/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 7f703d16f..7f703d16f 100644
--- a/xorg-server/xkbdata.src/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
diff --git a/xorg-server/xkbdata.src/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 7a4016fc5..7a4016fc5 100644
--- a/xorg-server/xkbdata.src/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
diff --git a/xorg-server/xkbdata.src/symbols/ke b/xorg-server/xkeyboard-config/symbols/ke
index 5ec174b7e..5ec174b7e 100644
--- a/xorg-server/xkbdata.src/symbols/ke
+++ b/xorg-server/xkeyboard-config/symbols/ke
diff --git a/xorg-server/xkbdata.src/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index fe0c2fd36..fe0c2fd36 100644
--- a/xorg-server/xkbdata.src/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
diff --git a/xorg-server/xkbdata.src/symbols/kg b/xorg-server/xkeyboard-config/symbols/kg
index be5424799..be5424799 100644
--- a/xorg-server/xkbdata.src/symbols/kg
+++ b/xorg-server/xkeyboard-config/symbols/kg
diff --git a/xorg-server/xkbdata.src/symbols/kh b/xorg-server/xkeyboard-config/symbols/kh
index a97eb4420..a97eb4420 100644
--- a/xorg-server/xkbdata.src/symbols/kh
+++ b/xorg-server/xkeyboard-config/symbols/kh
diff --git a/xorg-server/xkbdata.src/symbols/kpdl b/xorg-server/xkeyboard-config/symbols/kpdl
index a8bdfb7f9..a8bdfb7f9 100644
--- a/xorg-server/xkbdata.src/symbols/kpdl
+++ b/xorg-server/xkeyboard-config/symbols/kpdl
diff --git a/xorg-server/xkbdata.src/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr
index 4c2fa9673..4c2fa9673 100644
--- a/xorg-server/xkbdata.src/symbols/kr
+++ b/xorg-server/xkeyboard-config/symbols/kr
diff --git a/xorg-server/xkbdata.src/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz
index 55bbb1f66..55bbb1f66 100644
--- a/xorg-server/xkbdata.src/symbols/kz
+++ b/xorg-server/xkeyboard-config/symbols/kz
diff --git a/xorg-server/xkbdata.src/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index b050cc477..b050cc477 100644
--- a/xorg-server/xkbdata.src/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
diff --git a/xorg-server/xkbdata.src/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam
index ffd1ca8bc..ffd1ca8bc 100644
--- a/xorg-server/xkbdata.src/symbols/latam
+++ b/xorg-server/xkeyboard-config/symbols/latam
diff --git a/xorg-server/xkbdata.src/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin
index 1d8ebbeeb..1d8ebbeeb 100644
--- a/xorg-server/xkbdata.src/symbols/latin
+++ b/xorg-server/xkeyboard-config/symbols/latin
diff --git a/xorg-server/xkbdata.src/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index c2c6b13a2..c2c6b13a2 100644
--- a/xorg-server/xkbdata.src/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
diff --git a/xorg-server/xkbdata.src/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 99cb4601c..99cb4601c 100644
--- a/xorg-server/xkbdata.src/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
diff --git a/xorg-server/xkbdata.src/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk
index cfc5b1ff9..cfc5b1ff9 100644
--- a/xorg-server/xkbdata.src/symbols/lk
+++ b/xorg-server/xkeyboard-config/symbols/lk
diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 5956ace48..5956ace48 100644
--- a/xorg-server/xkbdata.src/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
diff --git a/xorg-server/xkbdata.src/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv
index 556be6c66..556be6c66 100644
--- a/xorg-server/xkbdata.src/symbols/lv
+++ b/xorg-server/xkeyboard-config/symbols/lv
diff --git a/xorg-server/xkbdata.src/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index 16d071744..16d071744 100644
--- a/xorg-server/xkbdata.src/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am
index 1d43f40c2..1d43f40c2 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple
index fc1742c45..fc1742c45 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 4932eb89a..4932eb89a 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
index 92c54916c..92c54916c 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index 56ef85bf6..56ef85bf6 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
index 6cb5fa314..6cb5fa314 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
index 9a8f8de23..9a8f8de23 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index 8eb82eb70..8eb82eb70 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
index 000bcdb0b..000bcdb0b 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 44435201b..44435201b 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp
index a4af79f35..a4af79f35 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
index 085de0e4b..085de0e4b 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
index b60690e4d..b60690e4d 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
index d8bf0d650..d8bf0d650 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
index 8f1785742..8f1785742 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
index d5d8c1c4c..d5d8c1c4c 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index fed3253cf..fed3253cf 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao
index 30c039a0c..30c039a0c 100644
--- a/xorg-server/xkbdata.src/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
diff --git a/xorg-server/xkbdata.src/symbols/me b/xorg-server/xkeyboard-config/symbols/me
index a4b407376..a4b407376 100644
--- a/xorg-server/xkbdata.src/symbols/me
+++ b/xorg-server/xkeyboard-config/symbols/me
diff --git a/xorg-server/xkbdata.src/symbols/mk b/xorg-server/xkeyboard-config/symbols/mk
index c69439c5d..c69439c5d 100644
--- a/xorg-server/xkbdata.src/symbols/mk
+++ b/xorg-server/xkeyboard-config/symbols/mk
diff --git a/xorg-server/xkbdata.src/symbols/ml b/xorg-server/xkeyboard-config/symbols/ml
index 1cac28c41..1cac28c41 100644
--- a/xorg-server/xkbdata.src/symbols/ml
+++ b/xorg-server/xkeyboard-config/symbols/ml
diff --git a/xorg-server/xkbdata.src/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm
index 2f5319c42..2f5319c42 100644
--- a/xorg-server/xkbdata.src/symbols/mm
+++ b/xorg-server/xkeyboard-config/symbols/mm
diff --git a/xorg-server/xkbdata.src/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index 08109b781..08109b781 100644
--- a/xorg-server/xkbdata.src/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
diff --git a/xorg-server/xkbdata.src/symbols/mt b/xorg-server/xkeyboard-config/symbols/mt
index 5069aa4ed..5069aa4ed 100644
--- a/xorg-server/xkbdata.src/symbols/mt
+++ b/xorg-server/xkeyboard-config/symbols/mt
diff --git a/xorg-server/xkbdata.src/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv
index 22aa33986..22aa33986 100644
--- a/xorg-server/xkbdata.src/symbols/mv
+++ b/xorg-server/xkeyboard-config/symbols/mv
diff --git a/xorg-server/xkbdata.src/symbols/nbsp b/xorg-server/xkeyboard-config/symbols/nbsp
index b3bc6a218..b3bc6a218 100644
--- a/xorg-server/xkbdata.src/symbols/nbsp
+++ b/xorg-server/xkeyboard-config/symbols/nbsp
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
index ff070065a..ff070065a 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
index 0439677e4..0439677e4 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
diff --git a/xorg-server/xkbdata.src/symbols/ng b/xorg-server/xkeyboard-config/symbols/ng
index 5b3a19e27..5b3a19e27 100644
--- a/xorg-server/xkbdata.src/symbols/ng
+++ b/xorg-server/xkeyboard-config/symbols/ng
diff --git a/xorg-server/xkbdata.src/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index f4e698a94..f4e698a94 100644
--- a/xorg-server/xkbdata.src/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
diff --git a/xorg-server/xkbdata.src/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 56c3d2c42..56c3d2c42 100644
--- a/xorg-server/xkbdata.src/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
index 71200ec4d..71200ec4d 100644
--- a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
index 515b69eef..515b69eef 100644
--- a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-51
index fd98fbf28..fd98fbf28 100644
--- a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-51
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w
index 6962aa971..6962aa971 100644
--- a/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w
diff --git a/xorg-server/xkbdata.src/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 26085c010..26085c010 100644
--- a/xorg-server/xkbdata.src/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
diff --git a/xorg-server/xkbdata.src/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc
index 4fda9949c..4fda9949c 100644
--- a/xorg-server/xkbdata.src/symbols/olpc
+++ b/xorg-server/xkeyboard-config/symbols/olpc
diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc
index a359b8023..a359b8023 100644
--- a/xorg-server/xkbdata.src/symbols/pc
+++ b/xorg-server/xkeyboard-config/symbols/pc
diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk
index da1198772..da1198772 100644
--- a/xorg-server/xkbdata.src/symbols/pk
+++ b/xorg-server/xkeyboard-config/symbols/pk
diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index 9ac908779..9ac908779 100644
--- a/xorg-server/xkbdata.src/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
diff --git a/xorg-server/xkbdata.src/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index 509db14ea..509db14ea 100644
--- a/xorg-server/xkbdata.src/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
diff --git a/xorg-server/xkbdata.src/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index b2842bd79..b2842bd79 100644
--- a/xorg-server/xkbdata.src/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
diff --git a/xorg-server/xkbdata.src/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 9aab69119..9aab69119 100644
--- a/xorg-server/xkbdata.src/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 0e059afad..0e059afad 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkeyboard-config/symbols/se
index 6e24202a7..6e24202a7 100644
--- a/xorg-server/xkbdata.src/symbols/se
+++ b/xorg-server/xkeyboard-config/symbols/se
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
index b1123e70e..b1123e70e 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/jp b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
index 31bb3b59a..31bb3b59a 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
diff --git a/xorg-server/xkbdata.src/symbols/shift b/xorg-server/xkeyboard-config/symbols/shift
index 78951c1ec..78951c1ec 100644
--- a/xorg-server/xkbdata.src/symbols/shift
+++ b/xorg-server/xkeyboard-config/symbols/shift
diff --git a/xorg-server/xkbdata.src/symbols/si b/xorg-server/xkeyboard-config/symbols/si
index ced6d2fe7..ced6d2fe7 100644
--- a/xorg-server/xkbdata.src/symbols/si
+++ b/xorg-server/xkeyboard-config/symbols/si
diff --git a/xorg-server/xkbdata.src/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk
index 62d0e7998..62d0e7998 100644
--- a/xorg-server/xkbdata.src/symbols/sk
+++ b/xorg-server/xkeyboard-config/symbols/sk
diff --git a/xorg-server/xkbdata.src/symbols/sn b/xorg-server/xkeyboard-config/symbols/sn
index 90ffe6111..90ffe6111 100644
--- a/xorg-server/xkbdata.src/symbols/sn
+++ b/xorg-server/xkeyboard-config/symbols/sn
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
index e1a77d957..e1a77d957 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/us b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
index 76d41053c..76d41053c 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/srvr_ctrl b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
index cf7012b4d..cf7012b4d 100644
--- a/xorg-server/xkbdata.src/symbols/srvr_ctrl
+++ b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
index 00692e334..00692e334 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
index ea54207b8..ea54207b8 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ara
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index d6ce057d4..d6ce057d4 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
index 4d966f551..4d966f551 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/br
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 0f0aa2923..0f0aa2923 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index c952fc559..c952fc559 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 6f6b198c5..6f6b198c5 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 3b1301687..3b1301687 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index 4f43112ab..4f43112ab 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 1070719a5..1070719a5 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 789df5519..789df5519 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index 817423968..817423968 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index f52d1956b..f52d1956b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index d21a116cf..d21a116cf 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index aa5fecbfa..aa5fecbfa 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index 960bcfc32..960bcfc32 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index 5be8647d2..5be8647d2 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 51959b23f..51959b23f 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index 6e51cb342..6e51cb342 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index 6661afddf..6661afddf 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 703614277..703614277 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index 1d1d43449..1d1d43449 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
index 684b54911..684b54911 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index 561abb594..561abb594 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
index df87262ed..df87262ed 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ro
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index 833576dcc..833576dcc 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
index ec41629cb..ec41629cb 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index f27726013..f27726013 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
index d07b150d1..d07b150d1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 3c95110a1..3c95110a1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
index 0eda715d8..0eda715d8 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
index a4c011d45..a4c011d45 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tw
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
index c49b21bce..c49b21bce 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ua
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
index 8a857a5ab..8a857a5ab 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
diff --git a/xorg-server/xkbdata.src/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy
index 7825d2376..7825d2376 100644
--- a/xorg-server/xkbdata.src/symbols/sy
+++ b/xorg-server/xkeyboard-config/symbols/sy
diff --git a/xorg-server/xkbdata.src/symbols/terminate b/xorg-server/xkeyboard-config/symbols/terminate
index 47e434d7f..47e434d7f 100644
--- a/xorg-server/xkbdata.src/symbols/terminate
+++ b/xorg-server/xkeyboard-config/symbols/terminate
diff --git a/xorg-server/xkbdata.src/symbols/th b/xorg-server/xkeyboard-config/symbols/th
index 050fb5278..050fb5278 100644
--- a/xorg-server/xkbdata.src/symbols/th
+++ b/xorg-server/xkeyboard-config/symbols/th
diff --git a/xorg-server/xkbdata.src/symbols/tj b/xorg-server/xkeyboard-config/symbols/tj
index 0dcb29d43..0dcb29d43 100644
--- a/xorg-server/xkbdata.src/symbols/tj
+++ b/xorg-server/xkeyboard-config/symbols/tj
diff --git a/xorg-server/xkbdata.src/symbols/tm b/xorg-server/xkeyboard-config/symbols/tm
index 241b4e822..241b4e822 100644
--- a/xorg-server/xkbdata.src/symbols/tm
+++ b/xorg-server/xkeyboard-config/symbols/tm
diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr
index c217a7af0..c217a7af0 100644
--- a/xorg-server/xkbdata.src/symbols/tr
+++ b/xorg-server/xkeyboard-config/symbols/tr
diff --git a/xorg-server/xkbdata.src/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index eb6fbc4ac..eb6fbc4ac 100644
--- a/xorg-server/xkbdata.src/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
diff --git a/xorg-server/xkbdata.src/symbols/tz b/xorg-server/xkeyboard-config/symbols/tz
index 8936a0363..8936a0363 100644
--- a/xorg-server/xkbdata.src/symbols/tz
+++ b/xorg-server/xkeyboard-config/symbols/tz
diff --git a/xorg-server/xkbdata.src/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index 150ada562..150ada562 100644
--- a/xorg-server/xkbdata.src/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index e2c40a4e5..e2c40a4e5 100644
--- a/xorg-server/xkbdata.src/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
diff --git a/xorg-server/xkbdata.src/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz
index b37a6ca3f..b37a6ca3f 100644
--- a/xorg-server/xkbdata.src/symbols/uz
+++ b/xorg-server/xkeyboard-config/symbols/uz
diff --git a/xorg-server/xkbdata.src/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn
index acebae572..acebae572 100644
--- a/xorg-server/xkbdata.src/symbols/vn
+++ b/xorg-server/xkeyboard-config/symbols/vn
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
index 50be49bb4..50be49bb4 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
index dcc143bb0..dcc143bb0 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/amiga
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
index c06431fb8..c06431fb8 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/ataritt
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
diff --git a/xorg-server/xkbdata.src/symbols/za b/xorg-server/xkeyboard-config/symbols/za
index 0d53b1c1a..0d53b1c1a 100644
--- a/xorg-server/xkbdata.src/symbols/za
+++ b/xorg-server/xkeyboard-config/symbols/za
diff --git a/xorg-server/xkbdata.src/types/Makefile.am b/xorg-server/xkeyboard-config/types/Makefile.am
index 6da3ccb78..6da3ccb78 100644
--- a/xorg-server/xkbdata.src/types/Makefile.am
+++ b/xorg-server/xkeyboard-config/types/Makefile.am
diff --git a/xorg-server/xkbdata.src/types/README b/xorg-server/xkeyboard-config/types/README
index 1a1e2c01e..1a1e2c01e 100644
--- a/xorg-server/xkbdata.src/types/README
+++ b/xorg-server/xkeyboard-config/types/README
diff --git a/xorg-server/xkbdata.src/types/basic b/xorg-server/xkeyboard-config/types/basic
index cf1ee648b..cf1ee648b 100644
--- a/xorg-server/xkbdata.src/types/basic
+++ b/xorg-server/xkeyboard-config/types/basic
diff --git a/xorg-server/xkbdata.src/types/cancel b/xorg-server/xkeyboard-config/types/cancel
index 478c99c4b..478c99c4b 100644
--- a/xorg-server/xkbdata.src/types/cancel
+++ b/xorg-server/xkeyboard-config/types/cancel
diff --git a/xorg-server/xkbdata.src/types/caps b/xorg-server/xkeyboard-config/types/caps
index 7936df12f..7936df12f 100644
--- a/xorg-server/xkbdata.src/types/caps
+++ b/xorg-server/xkeyboard-config/types/caps
diff --git a/xorg-server/xkbdata.src/types/complete b/xorg-server/xkeyboard-config/types/complete
index 96d4fd572..96d4fd572 100644
--- a/xorg-server/xkbdata.src/types/complete
+++ b/xorg-server/xkeyboard-config/types/complete
diff --git a/xorg-server/xkbdata.src/types/default b/xorg-server/xkeyboard-config/types/default
index 18859b742..18859b742 100644
--- a/xorg-server/xkbdata.src/types/default
+++ b/xorg-server/xkeyboard-config/types/default
diff --git a/xorg-server/xkbdata.src/types/extra b/xorg-server/xkeyboard-config/types/extra
index a82fd10d2..a82fd10d2 100644
--- a/xorg-server/xkbdata.src/types/extra
+++ b/xorg-server/xkeyboard-config/types/extra
diff --git a/xorg-server/xkbdata.src/types/iso9995 b/xorg-server/xkeyboard-config/types/iso9995
index 80f3ee5cf..80f3ee5cf 100644
--- a/xorg-server/xkbdata.src/types/iso9995
+++ b/xorg-server/xkeyboard-config/types/iso9995
diff --git a/xorg-server/xkbdata.src/types/level5 b/xorg-server/xkeyboard-config/types/level5
index 05dafecf6..05dafecf6 100644
--- a/xorg-server/xkbdata.src/types/level5
+++ b/xorg-server/xkeyboard-config/types/level5
diff --git a/xorg-server/xkbdata.src/types/mousekeys b/xorg-server/xkeyboard-config/types/mousekeys
index 85440ca7f..85440ca7f 100644
--- a/xorg-server/xkbdata.src/types/mousekeys
+++ b/xorg-server/xkeyboard-config/types/mousekeys
diff --git a/xorg-server/xkbdata.src/types/nokia b/xorg-server/xkeyboard-config/types/nokia
index f77d8868a..f77d8868a 100644
--- a/xorg-server/xkbdata.src/types/nokia
+++ b/xorg-server/xkeyboard-config/types/nokia
diff --git a/xorg-server/xkbdata.src/types/numpad b/xorg-server/xkeyboard-config/types/numpad
index a48e76a64..a48e76a64 100644
--- a/xorg-server/xkbdata.src/types/numpad
+++ b/xorg-server/xkeyboard-config/types/numpad
diff --git a/xorg-server/xkbdata.src/types/pc b/xorg-server/xkeyboard-config/types/pc
index 3c1986aa3..3c1986aa3 100644
--- a/xorg-server/xkbdata.src/types/pc
+++ b/xorg-server/xkeyboard-config/types/pc
diff --git a/xorg-server/xkbdata.src/xkbrules.am b/xorg-server/xkeyboard-config/xkbrules.am
index e506a92d3..e506a92d3 100644
--- a/xorg-server/xkbdata.src/xkbrules.am
+++ b/xorg-server/xkeyboard-config/xkbrules.am
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.pc.in b/xorg-server/xkeyboard-config/xkeyboard-config.pc.in
index d44ba1482..d44ba1482 100644
--- a/xorg-server/xkbdata.src/xkeyboard-config.pc.in
+++ b/xorg-server/xkeyboard-config/xkeyboard-config.pc.in
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec.in b/xorg-server/xkeyboard-config/xkeyboard-config.spec.in
index 0b2082af7..0b2082af7 100644
--- a/xorg-server/xkbdata.src/xkeyboard-config.spec.in
+++ b/xorg-server/xkeyboard-config/xkeyboard-config.spec.in