xkb extension does not work in current Xamiga?

[Thorsten Frueauf <s_frueau%ira.uka.de@localhost>]

Hello!

I grabbed the xsrc tarball (it was dated from 2.1.1999) and build it on
my amiga (I did compile Xamiga only with Cl5426, the rest was generic).
But with the new Xamiga the xkb extension does no longer work:

If I start the server with "-xkbmap de +xkb" I still get the us mapped
keyboad (e.g. z instead of y). I even tried to recompile via
xkbcomp -xkm -o compiled/de.xkm -m de keymap/amiga, but I only
discovered that we seem to have a double default keyword in
xsrc/xc/programs/xkbcomp/keymap/amiga, the appended patch fixes
that. But still I get the us keylayout :-( I backed up my old
Xamiga, if I start that one, everything works like expected, so
I don't suspect any errors in my startup files.

Any ideas?

Greets
      Thorsten

PS: Here is the diff for xsrc/xc/programs/xkbcomp/keymap/amiga, should
    I just commit it?

--- snip ---
--- xsrc/xc/programs/xkbcomp/keymap/amiga-orig  Tue Nov 24 13:47:04 1998
+++ xsrc/xc/programs/xkbcomp/keymap/amiga       Thu Jan  7 00:00:10 1999
@@ -7,7 +7,7 @@
     xkb_geometry       { include "amiga(usa1)"         };
 };
 
-default xkb_keymap "de" {
+xkb_keymap "de" {
     xkb_keycodes       { include "amiga(de)"           };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
--- snip ---