Hello community, here is the log from the commit of package xkeyboard-config checked in at Fri Jun 9 23:36:11 CEST 2006. -------- --- xkeyboard-config/xkeyboard-config.changes 2006-04-15 22:10:19.000000000 +0200 +++ xkeyboard-config/xkeyboard-config.changes 2006-06-09 17:51:59.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 9 17:51:50 CEST 2006 - sndirsch@suse.de + +- ca_multi.diff: + * added support for "Canada - Multilingual" keyboard (Bug #158951) + +------------------------------------------------------------------- New: ---- ca_multi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.kjV6te/_old 2006-06-09 23:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.kjV6te/_new 2006-06-09 23:36:04.000000000 +0200 @@ -22,7 +22,7 @@ PreReq: /bin/ln /bin/rm Autoreqprov: on Version: 0.8 -Release: 1 +Release: 2 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Source1: README.SuSE @@ -31,6 +31,7 @@ Patch4: p_macintosh-kb.diff Patch5: xkeyboard-config_korean.diff Patch6: ralt.diff +Patch7: ca_multi.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,6 +57,7 @@ %patch4 -p2 %patch5 -p1 %patch6 +%patch7 %if !%{REPLACE_XORG_XKB_FILES} cp $RPM_SOURCE_DIR/README.SuSE . %endif @@ -112,6 +114,9 @@ %endif %changelog -n xkeyboard-config +* Fri Jun 09 2006 - sndirsch@suse.de +- ca_multi.diff: + * added support for "Canada - Multilingual" keyboard (Bug #158951) * Sat Apr 15 2006 - sndirsch@suse.de - updated to release 0.8 * obsoletes khmer.diff, numlock-scrollLock.diff ++++++ ca_multi.diff ++++++ --- rules/base.ml_s.part.orig 2006-01-15 00:47:48.000000000 +0100 +++ rules/base.ml_s.part 2006-06-09 17:56:25.000000000 +0200 @@ -18,6 +18,8 @@ $pcmodels intl = us(%mcompose) * intl = us(pc104compose) * jp = pc(pc102)+jp(latin)+jp:2 + $pcmodels ca_enhanced = pc(%m)+ca(fr)+group(rctrl_switch) + * ca_enhanced = pc(pc105)+ca(fr)+group(rctrl_switch) $pcmodels $nonlatin = pc(%m)+us+%l%(v):2 $pcmodels * = pc(%m)+%l%(v) * $nonlatin = pc(pc105)+us+%l%(v):2 diff -u -r ../xkeyboard-config-0.7.orig/rules/base.xml.in ./rules/base.xml.in --- ../xkeyboard-config-0.7.orig/rules/base.xml.in 2006-06-09 16:56:57.865876600 +0200 +++ ./rules/base.xml.in 2006-06-09 17:06:36.129818613 +0200 @@ -1039,6 +1039,13 @@ </layout> <layout> <configItem> + <name>ca_enhanced</name> + <_shortDescription>CaE + <_description>Canada (Multilingual) + </configItem> + </layout> + <layout> + <configItem> <name>ca</name> <_shortDescription>Can <_description>Canada @@ -1046,6 +1053,12 @@ <variantList> <variant> <configItem> + <name>fr</name> + <_description>French + </configItem> + </variant> + <variant> + <configItem> <name>fr-dvorak</name> <_description>French Dvorak </configItem> diff -u -r ../xkeyboard-config-0.7.orig/symbols/ca ./symbols/ca --- ../xkeyboard-config-0.7.orig/symbols/ca 2006-06-09 16:56:58.451774209 +0200 +++ ./symbols/ca 2006-06-09 17:07:48.768124077 +0200 @@ -1,6 +1,15 @@ // $XKeyboardConfig: xkbdesc/symbols/ca,v 1.13 2005/10/17 00:38:54 svu Exp $ default partial +xkb_symbols "default" { + name[Group1] = "Canada - Multilingual"; + + include "ca(multi)" + include "ca(multi-2gr):2" + include "group(rctrl_switch)" +}; + +default partial xkb_symbols "fr" { name[Group1] = "Canada"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org