Hello community, here is the log from the commit of package xkeyboard-config checked in at Sun Jun 25 01:26:58 CEST 2006. -------- --- xkeyboard-config/xkeyboard-config.changes 2006-06-14 06:19:42.000000000 +0200 +++ xkeyboard-config/xkeyboard-config.changes 2006-06-24 10:41:02.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 24 10:40:25 CEST 2006 - sndirsch@suse.de + +- logitech.diff: + * removed double entry for XF86AudioRaiseVolume (Bug #181118) + +------------------------------------------------------------------- New: ---- logitech.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.RD2GT0/_old 2006-06-25 01:26:36.000000000 +0200 +++ /var/tmp/diff_new_pack.RD2GT0/_new 2006-06-25 01:26:36.000000000 +0200 @@ -22,7 +22,7 @@ PreReq: /bin/ln /bin/rm Autoreqprov: on Version: 0.8 -Release: 4 +Release: 5 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Source1: README.SuSE @@ -32,6 +32,7 @@ Patch5: xkeyboard-config_korean.diff Patch6: ralt.diff Patch7: ISO_Level5.diff +Patch8: logitech.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -58,6 +59,7 @@ %patch5 -p1 %patch6 %patch7 +%patch8 %if !%{REPLACE_XORG_XKB_FILES} cp $RPM_SOURCE_DIR/README.SuSE . %endif @@ -114,6 +116,9 @@ %endif %changelog -n xkeyboard-config +* Sat Jun 24 2006 - sndirsch@suse.de +- logitech.diff: + * removed double entry for XF86AudioRaiseVolume (Bug #181118) * Wed Jun 14 2006 - sndirsch@suse.de - use explicit hexadecimal values instead of XK_ISO_Level5 defines; makes changes in X.Org unnecessary (Bug #158951, X.Org Bug #4411) ++++++ logitech.diff ++++++ Index: symbols/inet =================================================================== RCS file: /cvs/xlibs/xkbdesc/symbols/inet,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- symbols/inet 13 Jun 2006 00:39:29 -0000 1.35 +++ symbols/inet 22 Jun 2006 19:39:41 -0000 1.36 @@ -1109,7 +1109,6 @@ key <I22> { [ XF86AudioPlay, XF86AudioPause ] }; key <I24> { [ XF86AudioStop ] }; key <I2E> { [ XF86AudioLowerVolume ] }; - key <I2F> { [ XF86AudioRaiseVolume ] }; key <I30> { [ XF86AudioRaiseVolume ] }; key <I32> { [ XF86HomePage ] }; key <I3B> { [ XF86New ] }; @@ -1240,6 +1239,13 @@ partial alphanumeric_keys xkb_symbols "logiitc" { include "inet(logitech_base)" + + key <I2F> { [ XF86AudioRaiseVolume ] }; + + // Just to override RaiseVolume from logitech_base, + // since no keysym can have two keycodes, see + // https://bugs.freedesktop.org/show_bug.cgi?id=7095 + key <I30> { [ XF86Launch1 ] }; }; // Logitech Internet Keyboard ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org