hoary->breezy upgrade puts nodeadkeys into options, not variant

Some more stabs: maybe this has something to do with the slightly messy
configuration that was created during upgrade?

Section "InputDevice"
        Identifier "Generic Keyboard"
        Driver "kbd"
        Option "CoreKeyboard"
        Option "XkbRules" "xorg"
        Option "XkbModel" "pc105"
        Option "XkbLayout" "de"
        Option "XkbOptions"
"nodeadkeys,lv3:lwin_switch,lv3:lwin_switch,lv3:lwin_switch,lv3:lwin_switch"
EndSection

Please also note that I get deadkeys, even if I switch to "Eliminiate dead keys"
in the Gnome keyboard dialog and nodeadkeys is present in xorg.conf. "setxkbmap
de nodeadkeys" works flawlessly, though.

what does "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd" looks like?

Wow, the lv3:lwin_switch thing is really cool. nodeadkeys should be in
XkbVariant, not XkbOptions, though.

(In reply to comment #2)
> what does "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd" looks like?

 layouts = [de nodeadkeys]
 model = pc105
 overrideSettings = false
 options = [lv3 lv3:lwin_switch,grp grp:alts_toggle]

(In reply to comment #3)
> Wow, the lv3:lwin_switch thing is really cool. nodeadkeys should be in
> XkbVariant, not XkbOptions, though.

This indeed helps. Now I get nodeadkeys behavior in gdm, and it's also correct
in Gnome.

So this indeed seems to be the cause for this bug. Retitling the bug appropriately.

okay. i think it puts nodeadkeys into the variant now, but it was in options
before, so we keep that one around. i don't think we can really transition this
sensibly, sadly. i'll poke at it, though. thanks for following up!

I think it could be related to ubuntu bug 21526. Bug 21526 would depends on this
one. What do you think?

Is there still a problem with upgrades to breezy here?

Not sure whether it is because of this, but after a hoary->breezy upgrade I get
the dreaded X/Gnome keyboard question dialog again. Keyboard works flawlessly,
though.

(In reply to comment #9)
> Keyboard works flawlessly, though.

Sorry, that was too quick. In fact nothing changed at all since I filed this
bug: I still get

        Option "XkbOptions"
"nodeadkeys,lv3:lwin_switch,lv3:lwin_switch,lv3:lwin_switch,lv3:lwin_switch"

after a hoary->breezy upgrade, have dead keys, and the keyboard question.

i fixed this a while back