Bug#633849: xserver-xorg: XKB settings lost after suspend (hibernate) / resume

[mega@retes.hu (Gábor Melis)]

I remap modifier keys quite a bit:

partial modifier_keys
xkb_symbols "lisp_machine_modifiers" {
    key <LCTL> { [ Super_L, Super_L ] };
    key <RCTL> { [ Super_R, Super_R ] };
    key <LALT> { [ Control_L, Control_L ] };
    key <RALT> { [ Control_R, Control_R ] };
    key <LWIN> { [ Alt_L, Meta_L ] };
    key <MENU> { [ Alt_R, Meta_R ] };
    modifier_map Control { <RALT>, <LALT> };
    modifier_map Mod1 { <LWIN>, <MENU> };
    modifier_map Mod4 { <LCTL>, <RCTL> };
};

After suspend/hibernate LCTL, RCTL and MENU revert to their original
meaning. Switching to the console and back is also enough to trigger it.
I'm running a fully updated (as of today) Wheezy.