add xkb-compat.patch

2 files changed, 747 insertions, 0 deletions

diff --git a/debian/patches/series b/debian/patches/series
index 20483e72..357abaad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ proc_set_init_task.patch
 newRPC.patch
 translatorslist-detect-passive-translators.patch
 revert-remove-threadvars-hack.patch
+xkb-compat.patch
diff --git a/debian/patches/xkb-compat.patch b/debian/patches/xkb-compat.patch
new file mode 100644
index 00000000..a4666e9b
--- /dev/null
+++ b/debian/patches/xkb-compat.patch
@@ -0,0 +1,746 @@
+TODO: the console should just not use keymaps at all any more, and use layout/variant...
+
+diff --git a/console-client/xkb/xkb-data/keymap/hurd b/console-client/xkb/xkb-data/keymap/hurd
+index b123f2b..3d47277 100644
+--- a/console-client/xkb/xkb-data/keymap/hurd
++++ b/console-client/xkb/xkb-data/keymap/hurd
+@@ -4,7 +4,7 @@
+ xkb_keymap "Hurd" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols 	{ include "pc(pc105)+us+hurd+group(win_switch)+compose(menu)"	};
+     xkb_geometry 	{ include "pc"			};
+ };
+@@ -12,7 +12,7 @@ xkb_keymap "Hurd" {
+ default xkb_keymap "us" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"		};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+us+hurd"		};
+     xkb_geometry	{ include "pc"			};
+ };
+@@ -21,21 +21,21 @@ default xkb_keymap "us" {
+ xkb_keymap "ar" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ara+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "be"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+be+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "bg"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+bg+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+@@ -43,7 +43,7 @@ xkb_keymap "bg"	{
+ xkb_keymap "br"	{
+     xkb_keycodes	{ include "xfree86"	};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+br+hurd"	};
+     xkb_geometry 	{ include "pc(abnt2)"		};
+ };
+@@ -53,168 +53,168 @@ xkb_keymap "br"	{
+ xkb_keymap "cz" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+cz+hurd"	};
+     xkb_geometry	{ include "pc"			};
+ };
+ xkb_keymap "de"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+de+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ch_de"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ch(de)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ch_fr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ch(fr)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "dk"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+dk+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "dvorak" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+us(dvorak)+hurd"};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "en_US" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols 	{ include "pc(pc105)+us+hurd"	};
+     xkb_geometry 	{ include "pc"			};
+ };
+ xkb_keymap "es"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+es+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "fr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+fr+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "fr-latin9" {
+     xkb_keycodes        { include "xfree86"             };
+     xkb_types           { include "default+hurd"        };
+-    xkb_compatibility   { include "default"             };
++    xkb_compatibility   { include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"             };
+     xkb_symbols         { include "pc(pc105)+fr-latin9+hurd" };
+     xkb_geometry        { include "pc"           	};
+ };
+ xkb_keymap "fr_CA"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ca+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "gb"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+gb+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "hr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+hr+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "it"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+it+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "jp106" {
+     xkb_keycodes	{ include "xfree86"	};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "jp(jp106)+hurd"	};
+     xkb_geometry	{ include "pc(jp106)"		};
+ };
+ xkb_keymap "lt"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+lt+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "lt_std"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+lt(std)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "lv"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+lv+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "mk" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+mk+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "mt" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+mt+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "neo"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+de(neo)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "no"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+no+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "pl"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+pl+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "pt"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+pt+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+@@ -222,49 +222,49 @@ xkb_keymap "pt"	{
+ xkb_keymap "ro" {
+     xkb_keycodes	{ include "xfree86"			};
+     xkb_types		{ include "default+hurd"		};
+-    xkb_compatibility	{ include "default"			};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"			};
+     xkb_symbols		{ include "pc(pc105)+ro(pc101)+hurd"	};
+     xkb_geometry	{ include "pc(pc101)"			};
+ };
+ xkb_keymap "ro_microsoft" {
+     xkb_keycodes	{ include "xfree86"			};
+     xkb_types		{ include "default+hurd"		};
+-    xkb_compatibility	{ include "default"			};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"			};
+     xkb_symbols		{ include "pc(pc105)+ro(pc105)+hurd"	};
+     xkb_geometry	{ include "pc(pc105)"			};
+ };
+ xkb_keymap "ru"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ru+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "se_FI"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+fi+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "se_SE"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+se+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "sl" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+si+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "sl_SI" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+si+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+@@ -274,7 +274,7 @@ xkb_keymap "sl_SI" {
+ xkb_keymap "sk" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+sk+hurd"	};
+     xkb_geometry	{ include "pc"			};
+ };
+@@ -282,49 +282,49 @@ xkb_keymap "sk" {
+ xkb_keymap "syr" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default" 		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)" 		};
+     xkb_symbols		{ include "pc(pc105)+syr+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };    
+ xkb_keymap "th"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+th+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "th_tis"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+th(tis)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "th_pat"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+th(pat)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "tr" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+tr+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "uk" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+uk)+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "us_flexpro" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "us(pc105)+hurd"	};
+     xkb_geometry	{ include "keytronic(FlexPro)"	};
+ };
+@@ -334,14 +334,14 @@ xkb_keymap "us_flexpro" {
+ xkb_keymap "us_intl" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "us(pc101)+us(intl)+hurd"	};
+     xkb_geometry	{ include "pc"			};
+ };
+ xkb_keymap "us_microsoft" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "us(pc105)+hurd"	};
+     xkb_geometry	{ include "microsoft"		};
+ };
+@@ -349,7 +349,7 @@ xkb_keymap "us_microsoft" {
+ xkb_keymap "uz" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+uz+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+@@ -358,35 +358,35 @@ xkb_keymap "uz" {
+ xkb_keymap "cz_qwerty" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+cz(qwerty)+hurd"	};
+     xkb_geometry	{ include "pc"			};
+ };
+ xkb_keymap "de_CH"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ch(de)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "fr_CH"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ch(fr)+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "mt_us" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+mt(us)+hurd"	};
+     xkb_geometry	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "sk_qwerty" {
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+sk(qwerty)+hurd"	};
+     xkb_geometry	{ include "pc"			};
+ };
+@@ -395,266 +395,266 @@ xkb_keymap "sk_qwerty" {
+ xkb_keymap "al"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+al+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ara"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ara+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "bd"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+bd+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "by"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+by+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "in"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+in+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ba"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ba+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ca"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ca+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "cn"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+cn+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "nl"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+nl+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "bt"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+bt+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "epo"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+epo+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ee"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ee+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "et"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+et+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "fi"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+fi+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ge"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ge+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "gr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+gr+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "il"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+il+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "hu"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+hu+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "is"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+is+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ie"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ie+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "jp"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+jp+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "kz"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+kz+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "kh"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+kh+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "kg"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+kg+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "kr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+kr+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "la"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+la+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "latam"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+latam+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "np"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+np+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ir"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ir+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "rs"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+rs+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "pk"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+pk+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "lk"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+lk+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "si"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+si+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "se"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+se+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ch"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ch+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "tr"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+tr+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "ua"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+ua+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };
+ xkb_keymap "vn"	{
+     xkb_keycodes	{ include "xfree86"		};
+     xkb_types		{ include "default+hurd"	};
+-    xkb_compatibility	{ include "default"		};
++    xkb_compatibility	{ include "basic+mousekeys+accessx(basic)+misc+iso9995+level5+caps(caps_lock)"		};
+     xkb_symbols		{ include "pc(pc105)+vn+hurd"	};
+     xkb_geometry 	{ include "pc(pc102)"		};
+ };