Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at 2013-09-05 23:28:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old) and /work/SRC/openSUSE:Factory/.xkeyboard-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkeyboard-config" Changes: -------- --- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes 2013-09-02 15:02:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xkeyboard-config.new/xkeyboard-config.changes 2013-09-05 23:28:20.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 4 13:41:51 UTC 2013 - sndir...@suse.com + +- renamed u_zhe-dze.patch to + U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch + after having it upstreamed (#fdo#68754) + +------------------------------------------------------------------- +Fri Aug 30 13:50:55 UTC 2013 - sndir...@suse.com + +- renamed p_suse.diff to n_suse.patch (never to be upstreamed) + according to X11:XOrg patch guidelines + +------------------------------------------------------------------- Old: ---- p_suse.diff u_zhe-dze.patch New: ---- U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch n_suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.J1MPHT/_old 2013-09-05 23:28:25.000000000 +0200 +++ /var/tmp/diff_new_pack.J1MPHT/_new 2013-09-05 23:28:25.000000000 +0200 @@ -34,10 +34,10 @@ License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 Group: System/X11/Utilities Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2 -Patch0: u_zhe-dze.patch +Patch0: U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch Patch11: U_Add-missing-backslash-bar-mapping-on-us-internationa.patch Patch12: U_ara-digits-Generate-arabic-script-digits-also-on-key.patch -Patch100: p_suse.diff +Patch100: n_suse.patch # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed Patch109: disable-2xalt_2xctrl-toggle.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ %prep %setup -q translation-update-upstream -%patch0 -p5 +%patch0 -p1 %patch11 -p1 %patch12 -p1 %patch100 ++++++ U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch ++++++ >From 8f49c92c54c53eab6d40d8be90ce06773d20d196 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndir...@suse.de> Date: Mon, 2 Sep 2013 11:07:38 +0200 Subject: [PATCH] rs(cyralpha): The key (z on US keyboard) should give dze, but it gives zhe The key (z on US keyboard) should give dze (Ѕ [capital] / ѕ), but it gives zhe (Ж [capital] / ж). (fdo#68754, patch by Oliver Neukum <oneu...@suse.de>) Signed-off-by: Stefan Dirsch <sndir...@suse.de> --- symbols/rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symbols/rs b/symbols/rs index 1b88d01..baa7a34 100644 --- a/symbols/rs +++ b/symbols/rs @@ -108,7 +108,7 @@ xkb_symbols "cyralpha" { key <AC11> { [ Serbian_tshe, Serbian_TSHE, any,any ] }; // ' " key <BKSL> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // \ | - key <AB01> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // z + key <AB01> { [ U0455, U0405, any,any ] }; // z key <AB02> { [ Cyrillic_dzhe, Cyrillic_DZHE, any,any ] }; // x key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, any,any ] }; // c key <AB04> { [ Cyrillic_ve, Cyrillic_VE, any,any ] }; // v -- 1.8.1.4 ++++++ n_suse.patch ++++++ - Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part Index: symbols/pc =================================================================== --- symbols/pc.orig +++ symbols/pc @@ -29,9 +29,9 @@ xkb_symbols "pc105" { key <LWIN> { [ Super_L ] }; key <RTSH> { [ Shift_R ] }; - key <RCTL> { [ Control_R ] }; + key <RCTL> { [ Control_R, Multi_key ] }; - key <RWIN> { [ Super_R ] }; + key <RWIN> { [ Super_R, Multi_key ] }; key <MENU> { [ Menu ] }; Index: rules/evdev.m_s.part =================================================================== --- rules/evdev.m_s.part.orig +++ rules/evdev.m_s.part @@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m) - applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) - * = +inet(evdev) + $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) + applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) + * = +inet(evdev)+terminate(ctrl_alt_bksp) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
