Comment 0 for bug 69061

I'm using xorg on my macbook with ubuntu dapper. My xorg.conf is configured as
followed:

Section "InputDevice"
 Identifier "Generic Keyboard"
 Driver "kbd"
 Option "CoreKeyboard"

 Option "XkbRules" "xorg"
 Option "XkbModel" "macbook"
 Option "XkbLayout" "fr"
EndSection

And I'm using the updated fr layout that can be found on
https://bugs.freedesktop.org/show_bug.cgi?id=6382

The keyboard works perfectly except that the keys "@ #" and "< >" are swapped.
This is nothard to fix, but how and where to fix in a clean way is not evident.

I fixed this by changing a little bit rules/xorg (so that it recognize "macbook"
model and load a little extra configuration in symbols/macintosh_vndor/apple for
attributing the right keys). I'm not sure that it's the right thing to do.

I'll include modified files as an attachments.