Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at Tue Mar 3 18:14:39 CET 2009. -------- --- xkeyboard-config/xkeyboard-config.changes 2009-02-09 10:28:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2009-03-03 14:43:44.599359980 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 12:52:55 CET 2009 - sndirsch@suse.de + +- xkeyboard-config 1.5 + * More than 40 bugs from freedesktop.org bugzilla were fixed. + symbols/inet restructured. +- obsoletes xkeyboard-config.powerbook-usb-iso-keyboard.patch, + unknown-keysym.diff +- adjusted MDSW-change-keycode.diff, xkeyboard-config.inet.patch + disable-2xalt_2xctrl-toggle.diff, ucw_suse.diff +- cs.po.diff + * removed dup to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- unknown-keysym.diff xkeyboard-config-1.3.tar.bz2 xkeyboard-config.powerbook-usb-iso-keyboard.patch New: ---- cs.po.diff xkeyboard-config-1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 1.3) +# spec file for package xkeyboard-config (Version 1.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 1.3 -Release: 33 +Version: 1.5 +Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch @@ -36,16 +36,15 @@ Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff -Patch103: xkeyboard-config.powerbook-usb-iso-keyboard.patch Patch104: xkeyboard-config.inet.patch Patch106: microsoftnek4k.diff Patch107: microsoftnek4k-symbols.diff Patch108: microsoftnek4k-keycodes.diff Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff -Patch111: unknown-keysym.diff Patch112: ucw_suse.diff Patch113: xkeyboard-config.sr@latin.diff +Patch114: cs.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -72,16 +71,15 @@ %patch40 %patch100 %patch101 -%patch103 %patch104 %patch106 %patch107 %patch108 %patch109 -p1 %patch110 -%patch111 %patch112 -p1 %patch113 -p0 +%patch114 -p0 mv po/sr@{Latn,latin}.po %build @@ -112,6 +110,16 @@ /usr/share/X11/xkb/ %changelog +* Tue Mar 03 2009 sndirsch@suse.de +- xkeyboard-config 1.5 + * More than 40 bugs from freedesktop.org bugzilla were fixed. + symbols/inet restructured. +- obsoletes xkeyboard-config.powerbook-usb-iso-keyboard.patch, + unknown-keysym.diff +- adjusted MDSW-change-keycode.diff, xkeyboard-config.inet.patch + disable-2xalt_2xctrl-toggle.diff, ucw_suse.diff +- cs.po.diff + * removed dup to fix build * Mon Feb 09 2009 sndirsch@suse.de - sr@Latn no longer exists; moved it to sr@latin * Thu Feb 05 2009 sndirsch@suse.de ++++++ cs.po.diff ++++++ --- po/cs.po.orig 2009-03-03 13:31:59.000000000 +0000 +++ po/cs.po 2009-03-03 13:34:47.000000000 +0000 @@ -2622,10 +2622,6 @@ msgstr "qwerty/číslice" msgid "qwertz" msgstr "qwertz" -#: ../rules/base.xml.in.h:647 -msgid "UCW layout (accented letters only)" -msgstr "rozložení UCW (pouze akcentovaná písmena)" - #: ../rules/base.xml.in.h:648 msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action." msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock." ++++++ disable-2xalt_2xctrl-toggle.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,15 +1,3 @@ -diff -aurp xkeyboard-config-1.2/rules/base.lst xkeyboard-config-1.2-patched/rules/base.lst ---- xkeyboard-config-1.2/rules/base.lst 2008-01-29 22:54:02.000000000 +0100 -+++ xkeyboard-config-1.2-patched/rules/base.lst 2008-05-13 13:13:01.545881000 +0200 -@@ -545,8 +545,6 @@ - grp:shift_caps_toggle Shift+CapsLock changes layout. - grp:alt_caps_toggle Alt+CapsLock changes layout. - grp:shifts_toggle Both Shift keys together change layout. -- grp:alts_toggle Both Alt keys together change layout. -- grp:ctrls_toggle Both Ctrl keys together change layout. - grp:ctrl_shift_toggle Ctrl+Shift change layout. - grp:lctrl_lshift_toggle LCtrl+LShift change layout. - grp:ctrl_alt_toggle Alt+Ctrl change layout. diff -aurp xkeyboard-config-1.2/rules/base.xml.in xkeyboard-config-1.2-patched/rules/base.xml.in --- xkeyboard-config-1.2/rules/base.xml.in 2008-01-08 00:08:25.000000000 +0100 +++ xkeyboard-config-1.2-patched/rules/base.xml.in 2008-05-13 13:13:23.870533000 +0200 ++++++ MDSW-change-keycode.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,23 +1,3 @@ ---- symbols/inet.orig 2008-05-14 06:09:21.000000000 +0200 -+++ symbols/inet 2008-05-14 06:16:57.000000000 +0200 -@@ -2093,7 +2093,7 @@ partial xkb_symbols "apple" { - key <K5E> { [ F14 ] }; - key <K5F> { [ F15 ] }; - key <K6C> { [ XF86Eject ] }; -- key <MDSW> { [ F16 ] }; -+ key <II5D> { [ F16 ] }; - }; - - partial alphanumeric_keys -@@ -2233,7 +2233,7 @@ xkb_symbols "logitech_g15" { - key <K74> { [ XF86WWW ] }; - key <K75> { [ XF86LaunchE ] }; - -- key <MDSW> { [ XF86Launch1 ] }; -+ key <II5D> { [ XF86Launch1 ] }; - key <NFER> { [ XF86Launch2 ] }; - - key <XFER> { [ XF86Launch8 ] }; --- keycodes/xfree86.orig 2008-05-14 06:17:28.000000000 +0200 +++ keycodes/xfree86 2008-05-14 06:21:33.000000000 +0200 @@ -301,6 +301,9 @@ xkb_keycodes "basic" { @@ -39,3 +19,23 @@ <LVL3> = 124; // <U7C> <ALT> = 125; // <U7D> <META> = 156; // <I1C> +--- symbols/inet.orig 2009-03-03 13:03:22.000000000 +0100 ++++ symbols/inet 2009-03-03 13:28:20.000000000 +0100 +@@ -1195,7 +1195,7 @@ xkb_symbols "logitech_g15" { + key <K72> { [ XF86LaunchC ] }; + key <K74> { [ XF86WWW ] }; + key <K75> { [ XF86LaunchE ] }; +- key <MDSW> { [ XF86Launch1 ] }; ++ key <II5D> { [ XF86Launch1 ] }; + key <NFER> { [ XF86Launch2 ] }; + key <XFER> { [ XF86Launch8 ] }; + }; +@@ -1732,7 +1732,7 @@ xkb_symbols "apple" { + key <K5E> { [ F14 ] }; + key <K5F> { [ F15 ] }; + key <K6C> { [ XF86Eject ] }; +- key <MDSW> { [ F16 ] }; ++ key <II5D> { [ F16 ] }; + key <KPEQ> { [ KP_Equal ] }; + }; + ++++++ ucw_suse.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -13,52 +13,6 @@ +#: ../rules/base.xml.in.h:648 +msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action." +msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock." -diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3.suse/rules/base.lst ---- xkeyboard-config-1.3.orig/rules/base.lst 2008-09-12 16:23:05.000000000 +0200 -+++ xkeyboard-config-1.3.suse/rules/base.lst 2008-09-15 11:22:06.000000000 +0200 -@@ -331,6 +331,7 @@ - bksl cz: With <\|> key - qwerty cz: qwerty - qwerty_bksl cz: qwerty, extended Backslash -+ ucw cz: UCW layout (accented letters only) - nodeadkeys dk: Eliminate dead keys - mac dk: Macintosh - mac_nodeadkeys dk: Macintosh, eliminate dead keys -@@ -561,6 +562,7 @@ - grp:lwin_switch Left Win-key switches layout while pressed. - grp:rwin_switch Right Win-key switches layout while pressed. - grp:win_switch Both Win-keys switch layout while pressed. -+ grp:caps_switch CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action. - grp:rctrl_switch Right Ctrl key switches layout while pressed. - grp:toggle Right Alt key changes layout. - grp:lalt_toggle Left Alt key changes layout. -@@ -624,6 +626,7 @@ - caps:capslock CapsLock toggles normal capitalization of alphabetic characters. - caps:swapescape Swap ESC and CapsLock. - caps:shiftlock CapsLock toggles Shift so all keys are affected. -+ caps:groupshift CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action. - altwin Alt/Win key behavior - altwin:menu Add the standard behavior to Menu key. - altwin:meta_alt Alt and Meta are on the Alt keys. -diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3.suse/rules/base.o_s.part ---- xkeyboard-config-1.3.orig/rules/base.o_s.part 2008-04-30 23:12:57.000000000 +0200 -+++ xkeyboard-config-1.3.suse/rules/base.o_s.part 2008-09-15 10:44:39.000000000 +0200 -@@ -12,6 +12,7 @@ - grp:win_switch = +group(win_switch) - grp:lwin_switch = +group(lwin_switch) - grp:rwin_switch = +group(rwin_switch) -+ grp:caps_switch = +group(caps_switch) - grp:toggle = +group(toggle) - grp:shifts_toggle = +group(shifts_toggle) - grp:ctrls_toggle = +group(ctrls_toggle) -@@ -46,6 +47,7 @@ - caps:shiftlock = +capslock(shiftlock) - caps:grouplock = +capslock(grouplock) - caps:swapescape = +capslock(swapescape) -+ caps:groupshift = +capslock(groupshift) - ctrl:nocaps = +ctrl(nocaps) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/rules/base.xml.in --- xkeyboard-config-1.3.orig/rules/base.xml.in 2008-09-12 16:23:05.000000000 +0200 +++ xkeyboard-config-1.3.suse/rules/base.xml.in 2008-09-15 15:24:15.000000000 +0200 @@ -194,3 +148,21 @@ // using the group(shift_caps_toggle) map, pressing: // Shift+Caps Lock toggles group partial modifier_keys +--- xkeyboard-config-1.5/rules/base.o_s.part.orig 2009-01-12 23:24:13.000000000 +0100 ++++ xkeyboard-config-1.5/rules/base.o_s.part 2009-03-03 13:43:43.000000000 +0100 +@@ -13,6 +13,7 @@ + grp:win_switch = +group(win_switch) + grp:lwin_switch = +group(lwin_switch) + grp:rwin_switch = +group(rwin_switch) ++ grp:caps_switch = +group(caps_switch) + grp:toggle = +group(toggle) + grp:shifts_toggle = +group(shifts_toggle) + grp:ctrls_toggle = +group(ctrls_toggle) +@@ -52,6 +53,7 @@ + caps:swapescape = +capslock(swapescape) + caps:escape = +capslock(escape) + caps:backspace = +capslock(backspace) ++ caps:groupshift = +capslock(groupshift) + ctrl:nocaps = +ctrl(nocaps) + ctrl:swapcaps = +ctrl(swapcaps) + ctrl:ctrl_ac = +ctrl(ctrl_ac) ++++++ xkeyboard-config-1.3.tar.bz2 -> xkeyboard-config-1.5.tar.bz2 ++++++ ++++ 79767 lines of diff (skipped) ++++++ xkeyboard-config.inet.patch ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:14.000000000 +0100 @@ -1,16 +1,10 @@ ---- symbols/inet -+++ symbols/inet -@@ -2191,12 +2191,12 @@ - key <I57> { [ XF86Launch0 ] }; +--- symbols/inet.orig 2009-01-12 23:24:13.000000000 +0100 ++++ symbols/inet 2009-03-03 13:00:45.000000000 +0100 +@@ -1689,6 +1689,7 @@ xkb_symbols "apple" { key <I58> { [ XF86Launch1 ] }; key <I59> { [ XF86Launch2 ] }; -+ key <K59> { [ KP_Equal ] }; + key <I5E> { [ XF86PowerOff ] }; ++ key <K59> { [ KP_Equal ] }; key <K5D> { [ F13 ] }; key <K5E> { [ F14 ] }; key <K5F> { [ F15 ] }; - key <K6C> { [ XF86Eject ] }; - key <MDSW> { [ F16 ] }; -- key <KPEQ> { [ KP_Equal ] }; - }; - - partial alphanumeric_keys ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org