Fresh installl selects fr_CA keyboard instead of US

[Jeff Bailey]

When doing a fresh install, I chose the US keyboard layout in the install, and X
has set the keyboard to the French Canadian layout.

Tks,
Jeff Bailey

[Jeff Bailey (jbailey)]

At about line 1700 of /var/lib/dpkg/info/xserver-xorg.config

    *--fr_CA) XMAP="ca"; VARIANT="fr";;

The right solution looks like it should be to add before it:

    us--fr_CA) XMAP="us"; VARIANT="pc104";;

[Matt Zimmerman (mdz)]

One of you, please upload this.

[Jeff Bailey (jbailey)]

(In reply to comment #2)
> One of you, please upload this.

Doing

[Jeff Bailey (jbailey)]

Hmm. I'm not convinced the change that I proposed is exactly right. On an
English Canadian machine, I get:

        Option "XkbRules" "xorg"
        Option "XkbModel" "pc104"
        Option "XkbLayout" "us"

But with this patch and a French Canadian (US Layout) machine, I get:

        Option "XkbRules" "xorg"
        Option "XkbModel" "pc105"
        Option "XkbLayout" "us"
        Option "XkbVariant" "pc104"

Is the solution instead to do:

    us--fr_CA) XMAP="us"; MODEL="pc104";;

?

[Daniel Stone (daniels)]

the fix in comment #1 was, indeed, completely wrong. c#4 has it right. i have
this in my local tree now, will upload when I finish the fix for #16628.

[Daniel Stone (daniels)]

fixed with -76