Hello community, here is the log from the commit of package xkeyboard-config checked in at Wed Oct 11 12:03:20 CEST 2006. -------- --- xkeyboard-config/xkeyboard-config.changes 2006-08-01 20:55:29.000000000 +0200 +++ /mounts/work_src_done/NOARCH/xkeyboard-config/xkeyboard-config.changes 2006-10-10 11:07:03.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Oct 10 11:03:05 CEST 2006 - sndirsch@suse.de + +- updated to release 0.9: + * Around 80 bugs from freedesktop.org bugzilla are fixed. + * New layouts/models/translations are introduced. + * Macintosh layouts are heavily redesigned (big thangs to Denis + Barbier). +- adjusted ibm_space_saver.diff, p_suse.diff +- obsoletes ISO_Level5.diff, c300.diff, logitech.diff, ralt.diff, + xkeyboard-config_korean.diff +- disabled p_macintosh-kb.diff since it no longer applies due to + radical changes for Macintosh layout (see above); hopefully it's + no longer required ... + +------------------------------------------------------------------- Old: ---- ISO_Level5.diff c300.diff logitech.diff ralt.diff xkeyboard-config-0.8.tar.bz2 xkeyboard-config_korean.diff New: ---- xkeyboard-config-0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.XzJdW3/_old 2006-10-11 12:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XzJdW3/_new 2006-10-11 12:02:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 0.8) +# spec file for package xkeyboard-config (Version 0.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,18 +19,13 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm Autoreqprov: on -Version: 0.8 -Release: 10 +Version: 0.9 +Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch: p_suse.diff Patch1: ibm_space_saver.diff Patch4: p_macintosh-kb.diff -Patch5: xkeyboard-config_korean.diff -Patch6: ralt.diff -Patch7: ISO_Level5.diff -Patch8: logitech.diff -Patch9: c300.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -51,14 +46,10 @@ %prep %setup -%patch -p2 +%patch %patch1 -%patch4 -p2 -%patch5 -p1 -%patch6 -%patch7 -%patch8 -%patch9 +### No longer applies due to heavily redesigned Macintosh layouts in 0.9 +#%patch4 -p2 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -85,6 +76,18 @@ /usr/share/X11/xkb/ %changelog -n xkeyboard-config +* Tue Oct 10 2006 - sndirsch@suse.de +- updated to release 0.9: + * Around 80 bugs from freedesktop.org bugzilla are fixed. + * New layouts/models/translations are introduced. + * Macintosh layouts are heavily redesigned (big thangs to Denis + Barbier). +- adjusted ibm_space_saver.diff, p_suse.diff +- obsoletes ISO_Level5.diff, c300.diff, logitech.diff, ralt.diff, + xkeyboard-config_korean.diff +- disabled p_macintosh-kb.diff since it no longer applies due to + radical changes for Macintosh layout (see above); hopefully it's + no longer required ... * Tue Aug 01 2006 - sndirsch@suse.de - added xorg-x11 to Requires/BuildRequires to fix build - cleanup ++++++ ibm_space_saver.diff ++++++ --- /var/tmp/diff_new_pack.XzJdW3/_old 2006-10-11 12:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XzJdW3/_new 2006-10-11 12:02:54.000000000 +0200 @@ -1,13 +1,27 @@ -diff -u -r ../xkbdesc.orig/rules/base.m_s.part ./rules/base.m_s.part ---- ../xkbdesc.orig/rules/base.m_s.part 2005-08-17 16:22:42.000000000 +0200 -+++ ./rules/base.m_s.part 2005-08-17 16:34:35.078323189 +0200 -@@ -1 +1,2 @@ +diff -u -r ../xkeyboard-config-0.9.old/rules/base.lists.part ./rules/base.lists.part +--- ../xkeyboard-config-0.9.old/rules/base.lists.part 2006-10-10 10:29:10.000000000 +0200 ++++ ./rules/base.lists.part 2006-10-10 10:29:23.000000000 +0200 +@@ -56,6 +56,8 @@ + toshiba_s3000 trust trustda \ + yahoo + ++! $specialkbds = ibm_space_saver ++ + // all layouts with 3rd and 4th groups + ! $threelevellayouts = al az \ + be br bt \ +diff -u -r ../xkeyboard-config-0.9.old/rules/base.m_s.part ./rules/base.m_s.part +--- ../xkeyboard-config-0.9.old/rules/base.m_s.part 2006-10-10 10:29:10.000000000 +0200 ++++ ./rules/base.m_s.part 2006-10-10 10:29:23.000000000 +0200 +@@ -1,3 +1,4 @@ $inetkbds = +inet(%m) + $specialkbds = +group(%m) -diff -u -r ../xkbdesc.orig/rules/base.xml.in ./rules/base.xml.in ---- ../xkbdesc.orig/rules/base.xml.in 2005-08-17 16:22:42.000000000 +0200 -+++ ./rules/base.xml.in 2005-08-17 16:37:09.029443593 +0200 -@@ -646,6 +646,12 @@ + $maclaptop = +inet(apple)+level3(enter_switch) + $macs = +inet(apple) +diff -u -r ../xkeyboard-config-0.9.old/rules/base.xml.in ./rules/base.xml.in +--- ../xkeyboard-config-0.9.old/rules/base.xml.in 2006-10-10 10:29:10.000000000 +0200 ++++ ./rules/base.xml.in 2006-10-10 10:29:23.000000000 +0200 +@@ -706,6 +706,12 @@ </model> <model> <configItem> @@ -20,27 +34,15 @@ <name>macintosh</name> <_description>Macintosh </configItem> -diff -u -r ../xkbdesc.orig/symbols/group ./symbols/group ---- ../xkbdesc.orig/symbols/group 2005-08-17 16:22:43.000000000 +0200 -+++ ./symbols/group 2005-08-17 16:23:50.872797699 +0200 -@@ -293,3 +293,9 @@ - virtualMods= AltGr +diff -u -r ../xkeyboard-config-0.9.old/symbols/group ./symbols/group +--- ../xkeyboard-config-0.9.old/symbols/group 2006-10-10 10:29:10.000000000 +0200 ++++ ./symbols/group 2006-10-10 10:30:46.000000000 +0200 +@@ -305,3 +305,8 @@ }; }; -+ + +// Override broken Numlock key on some IBM keyboards +partial +xkb_symbols "ibm_space_saver" { + key <NMLK> { [ Num_Lock, Num_Lock ] }; +}; ---- rules/base.lists.part.orig 2005-11-29 20:09:37.000000000 +0100 -+++ rules/base.lists.part 2005-12-01 07:13:19.000000000 +0100 -@@ -38,6 +38,8 @@ - sk1300 sk2500 sk6200 sk7100 sp_inet \ - sven symplon toshiba_s3000 trust trustda yahoo - -+! $specialkbds = ibm_space_saver -+ - // all layouts with 3rd and 4th groups - ! $threelevellayouts = al az \ - be br bt \ ++++++ p_suse.diff ++++++ --- /var/tmp/diff_new_pack.XzJdW3/_old 2006-10-11 12:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XzJdW3/_new 2006-10-11 12:02:54.000000000 +0200 @@ -1,22 +1,22 @@ ---- programs/xkbcomp/symbols/pc.orig 2004-04-19 14:49:33.935285846 +0200 -+++ programs/xkbcomp/symbols/pc 2004-04-19 15:13:04.523298499 +0200 -@@ -200,6 +200,7 @@ - include "pc/pc(basic)" - key <LALT> { [ Alt_L, Meta_L ] }; - key <RALT> { [ Alt_R, Meta_R ] }; -+ key <RCTL> { [ Control_R, Multi_key ] }; +--- symbols/pc.orig 2006-09-18 13:45:12.000000000 +0200 ++++ symbols/pc 2006-10-10 10:27:21.000000000 +0200 +@@ -37,9 +37,9 @@ + key <LWIN> { [ Super_L ] }; - }; + key <RTSH> { [ Shift_R ] }; +- key <RCTL> { [ Control_R ] }; ++ key <RCTL> { [ Control_R, Multi_key ] }; + key <RALT> { [ Alt_R, Meta_R ] }; +- key <RWIN> { [ Super_R ] }; ++ key <RWIN> { [ Super_R, Multi_key ] }; -@@ -216,8 +217,10 @@ - key <LALT> { [ Alt_L, Meta_L ] }; - key <RALT> { [ Alt_R, Meta_R ] }; - key <LWIN> { [ Super_L ] }; -- key <RWIN> { [ Super_R ] }; -+ key <RWIN> { [ Super_R, Multi_key ] }; - key <MENU> { [ Menu ] }; -+ key <RCTL> { [ Control_R, Multi_key ] }; -+ modifier_map Mod4 { Super_L, Super_R }; + key <MENU> { [ Menu ] }; - }; +@@ -48,6 +48,7 @@ + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; ++ modifier_map Mod4 { Super_L, Super_R }; + // Fake keys for virtual<->real modifiers mapping + key <LVL3> { [ ISO_Level3_Shift ] }; ++++++ xkeyboard-config-0.8.tar.bz2 -> xkeyboard-config-0.9.tar.bz2 ++++++ ++++ 97104 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de