3 files changed, 79 insertions, 95 deletions
diff --git a/xorg-server/xkeyboard-config/compat/default.in b/xorg-server/xkeyboard-config/compat/default.in
deleted file mode 100644
index 4c4461fb9..000000000
--- a/xorg-server/xkeyboard-config/compat/default.in
+++ /dev/null
@@ -1,12 +0,0 @@
-default xkb_compatibility "default"  {
-    include "basic"
-    augment "mousekeys"
-    augment "accessx(basic)"
-    augment "misc"
-    augment "iso9995"
-    augment "level5"
-// ??should be changed/renamed/removed
-//    augment "xfree86"
-    augment "japan"
-    augment "caps(caps_lock)"
-};
diff --git a/xorg-server/xkeyboard-config/compat/iso9995 b/xorg-server/xkeyboard-config/compat/iso9995
index 4dea5bf01..76188d1f0 100644
--- a/xorg-server/xkeyboard-config/compat/iso9995
+++ b/xorg-server/xkeyboard-config/compat/iso9995
@@ -1,80 +1,76 @@
-// Fairly complete set of symbol interpretations 
-// to provide reasonable default behavior
-
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelThree,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret ISO_Lock+Any {
-	action= ISOLock(affect= all,modifiers=modMapMods);
-    };
-
-    interpret ISO_Level2_Latch+Shift {
-	useModMapMods= level1;
-	action= LatchMods(modifiers=Shift);
-    };
-
-    interpret ISO_Level3_Shift+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= SetMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Shift {
-	action= SetMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Latch+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= LatchMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Latch {
-	action= LatchMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Lock+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= LockMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Lock {
-	action= LockMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Group_Latch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LatchGroup(group=2);
-    };
-
-    interpret ISO_Next_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LockGroup(group=+1);
-    };
-
-    interpret ISO_Prev_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LockGroup(group=-1);
-    };
-    interpret ISO_First_Group {
-	action= LockGroup(group=1);
-    };
-
-    interpret ISO_Last_Group {
-	action= LockGroup(group=2);
-    };
-
-    indicator "Group 2" {
-	!allowExplicit;
-	groups= All-Group1;
-    };
-};
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelThree,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Level2_Latch+Shift {
+	useModMapMods= level1;
+	action= LatchMods(modifiers=Shift);
+    };
+
+    interpret ISO_Level3_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Shift {
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch {
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock {
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Group_Latch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LatchGroup(group=2);
+    };
+
+    interpret ISO_Next_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=+1);
+    };
+
+    interpret ISO_Prev_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=-1);
+    };
+    interpret ISO_First_Group {
+	action= LockGroup(group=1);
+    };
+
+    interpret ISO_Last_Group {
+	action= LockGroup(group=2);
+    };
+
+    indicator "Group 2" {
+	!allowExplicit;
+	groups= All-Group1;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/makefile b/xorg-server/xkeyboard-config/compat/makefile
index 225163288..d8dc5d8c4 100644
--- a/xorg-server/xkeyboard-config/compat/makefile
+++ b/xorg-server/xkeyboard-config/compat/makefile
@@ -8,10 +8,10 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
 
 dist_xkbdata_compat_DATA = \
 accessx basic caps complete \
-default iso9995 \
-japan keypad ledcaps \
+iso9995 \
+japan ledcaps \
 lednum ledscroll level5 \
-misc mousekeys norepeat \
+misc mousekeys \
 olpc pc pc98 xfree86 \
 xtest README