French Canadian keyboard map not working on 6.9.0?

[Pierre-Luc Drouin]

Hi,

Before 6.9.0, I was using "setxkbmap ca_enhanced" to configure my french 
canadian keyboard on X. With 6.9.0, this is not working, and I have read 
that this is because I should now use the variant "fr" of the "ca" 
layout. However, when I try to load it with "setxkbmap ca fr" or 
"setxkbmap -layout ca -variant fr", it loads the "multi" variant instead 
of "fr":

%setxkbmap -layout ca -variant fr
%setxkbmap -print
xkb_keymap {
       xkb_keycodes  { include "xfree86+aliases(qwerty)"       };
       xkb_types     { include "complete"      };
       xkb_compat    { include "complete"      };
       xkb_symbols   { include 
"pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)"      };
       xkb_geometry  { include "pc(pc105)"     };
};

Am I doing something wrong?

Thank you!

Pierre-Luc Drouin