Bug#379148: xkb-data: macintosh XkbModel is broken

[Roger Leigh <rleigh@debian.org>]

Package: xkb-data
Version: 0.8-6
Severity: normal

I am using an Apple USB keyboard (United Kingdom version).

With the following in xorg.conf:

Section "InputDevice"
	Identifier	"Generic Keyboard"
	Driver		"kbd"
	Option		"CoreKeyboard"
	Option		"XkbRules"	"xorg"
	Option		"XkbModel"	"pc105"
	Option		"XkbLayout"	"gb"
#	Option		"XkbOptions"	"altwin:meta_win"
EndSection

The keyboard works, including all the alphanumeric keys, but the
punctuation is wrong.  This is because although the keycodes are the
same as a standard pc105 keyboard, the engraving on the keytops is
different.

With this in xorg.conf:

Section "InputDevice"
	Identifier	"Generic Keyboard"
	Driver		"kbd"
	Option		"CoreKeyboard"
	Option		"XkbRules"	"xorg"
	Option		"XkbModel"	"macintosh"
	Option		"XkbLayout"	"gb"
#	Option		"XkbOptions"	"altwin:meta_win"
EndSection

The keyboard is quite broken.  None of the alphabet keys work, and half
of the punctuation keys are broken.  The numeric keys do work.  Since
the keyboard is a macintosh keyboard (not ADB, though), this looks like
the correct configuration.

I saw this some time ago, but it was fixed.  This behaviour appeared
again today, possibly due to the recent xkb-data upload.

I'm happy to hack on the xkb-data to fix the keyboard; I just don't
know where to start.  I'm happy to do any testing; my system is
a Mac Mini G4 PowerMac.


Regards,
Roger

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (990, 'unstable')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-powerpc
Locale: LANG=en_GB.UTF8, LC_CTYPE=en_GB.UTF8 (charmap=UTF-8)

-- no debconf information