From 29d0acb890f6bba54d6d372cf65464abb9babffcc2d936bdaa91f29790750eeb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 30 Aug 2013 13:55:37 +0000 Subject: [PATCH 1/2] - renamed p_suse.diff to n_suse.patch (never to be upstreamed) according to X11:XOrg patch guidelines OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=94 --- p_suse.diff => n_suse.patch | 0 xkeyboard-config.changes | 6 ++++++ xkeyboard-config.spec | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) rename p_suse.diff => n_suse.patch (100%) diff --git a/p_suse.diff b/n_suse.patch similarity index 100% rename from p_suse.diff rename to n_suse.patch diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 395c585..f9b1a47 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 30 13:50:55 UTC 2013 - sndirsch@suse.com + +- renamed p_suse.diff to n_suse.patch (never to be upstreamed) + according to X11:XOrg patch guidelines + ------------------------------------------------------------------- Fri Aug 30 08:11:24 UTC 2013 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index f256343..7253dcb 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -37,7 +37,7 @@ Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{v Patch0: u_zhe-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 From 381148ca2a18431167a303cc6e491e0550e3b09a1c7e6723bb0ae97e2b2c4ba6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 4 Sep 2013 13:47:56 +0000 Subject: [PATCH 2/2] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=96 --- ...key-z-on-US-keyboard-should-give-dze.patch | 27 ++++++++++++++----- xkeyboard-config.changes | 7 +++++ xkeyboard-config.spec | 4 +-- 3 files changed, 30 insertions(+), 8 deletions(-) rename u_zhe-dze.patch => U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch (51%) diff --git a/u_zhe-dze.patch b/U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch similarity index 51% rename from u_zhe-dze.patch rename to U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch index c7bc95b..cd06ea1 100644 --- a/u_zhe-dze.patch +++ b/U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch @@ -1,10 +1,22 @@ -Author: Oliver Neukum -Subject: The key (z on US keyboard) should give dze (Ѕ [capital] / ѕ) but it gives zhe (Ж [capital] / ж) -References: bnc#780230 -Signed-off-by: Stefan Dirsch +From 8f49c92c54c53eab6d40d8be90ce06773d20d196 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +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 ---- /usr/share/X11/xkb/symbols/rs.alt 2012-09-13 15:39:18.039949695 +0200 -+++ /usr/share/X11/xkb/symbols/rs 2012-09-13 16:19:37.007170631 +0200 +The key (z on US keyboard) should give dze (Ѕ [capital] / ѕ), +but it gives zhe (Ж [capital] / ж). (fdo#68754, patch by +Oliver Neukum ) + +Signed-off-by: Stefan Dirsch +--- + 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 { [ Serbian_tshe, Serbian_TSHE, any,any ] }; // ' " key { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // \ | @@ -14,3 +26,6 @@ Signed-off-by: Stefan Dirsch key { [ Cyrillic_dzhe, Cyrillic_DZHE, any,any ] }; // x key { [ Cyrillic_tse, Cyrillic_TSE, any,any ] }; // c key { [ Cyrillic_ve, Cyrillic_VE, any,any ] }; // v +-- +1.8.1.4 + diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index f9b1a47..0c75ab7 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 4 13:41:51 UTC 2013 - sndirsch@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 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 7253dcb..b3e7416 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -34,7 +34,7 @@ Summary: The X Keyboard Extension 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: n_suse.patch @@ -56,7 +56,7 @@ make keyboards more accessible to people with physical impairments. %prep %setup -q translation-update-upstream -%patch0 -p5 +%patch0 -p1 %patch11 -p1 %patch12 -p1 %patch100