Bug#385392: xserver-xorg: jp106 keyboard definition from d-i makes a wrong configuration

[Kenshi Muto <kmuto@debian.org>]

Package: xserver-xorg
Version: 1:7.0.23
Severity: important
Tags: patch

I noticed when I installed Etch from daily debian-installer,
xserver-xorg had a wrong keyboard model for jp106 key.

Current configuration is:
xserver-xorg/config/inputdevice/keyboard/variant: jp106
xserver-xorg/config/inputdevice/keyboard/layout: jp
xserver-xorg/config/inputdevice/keyboard/model:
(if model is empty, pc104 keymap will be used.)

But jp106 keyboard configuration must be:
xserver-xorg/config/inputdevice/keyboard/variant:
xserver-xorg/config/inputdevice/keyboard/layout: jp
xserver-xorg/config/inputdevice/keyboard/model: jp106

I think the following small patch fixes this.

Index: xserver-xorg.config.in
===================================================================
--- xserver-xorg.config.in      (revision 3138)
+++ xserver-xorg.config.in      (working copy)
@@ -1005,7 +1005,7 @@
     hu) XMAP="hu";;
     is) XMAP="is";;
     it) XMAP="it";;
-    jp106) XMAP="jp"; VARIANT="jp106";;
+    jp106) XMAP="jp"; MODEL="jp106";;
     la) XMAP="latam";;
     lt) XMAP="lt";;
     # XXX should these be MODEL="macintosh"?