From e035d2140e53f1457c10ce5cd5cb2a9125cb1e9710b2b5a5cd206fec17afc4b1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 4 Jun 2014 10:08:54 +0000 Subject: [PATCH] - Update to version 2.12 * bugfix release * supersedes U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch - remove n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch, which is considered wrong (bnc#68754) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=108 --- ...it-fr-and-nl-keyboards-generate-KP_S.patch | 62 ------------------- ...key-z-on-US-keyboard-should-give-dze.patch | 31 ---------- xkeyboard-config-2.11.tar.bz2 | 3 - xkeyboard-config-2.12.tar.bz2 | 3 + xkeyboard-config.changes | 9 +++ xkeyboard-config.spec | 6 +- 6 files changed, 13 insertions(+), 101 deletions(-) delete mode 100644 U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch delete mode 100644 n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch delete mode 100644 xkeyboard-config-2.11.tar.bz2 create mode 100644 xkeyboard-config-2.12.tar.bz2 diff --git a/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch b/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch deleted file mode 100644 index d27c5ee..0000000 --- a/U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf93beb47f9907946dd72ca4d481ffbbbadda53a Mon Sep 17 00:00:00 2001 -From: Egbert Eich -Date: Mon, 30 May 2011 10:51:58 +0200 -Subject: [PATCH] Let key on it,fr and nl keyboards generate - KP_Separator - -Notwithstanding the never ending discussion what character this -key on the numeric keypad should produce this key should produce -what is imprinted on the keyboards. After all all three countries -are observing the SI standards. -This makes this layout more consistent and match for instance -what is done in the de layout. - -Signed-off-by: Egbert Eich ---- - symbols/fr | 2 ++ - symbols/it | 2 ++ - symbols/nl | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/symbols/fr b/symbols/fr -index 3898b1c..9c89db8 100644 ---- a/symbols/fr -+++ b/symbols/fr -@@ -36,6 +36,8 @@ xkb_symbols "basic" { - key { [ colon, slash, periodcentered, division ] }; - key { [ exclam, section, dead_belowdot, dead_abovedot ] }; - -+ include "kpdl(comma)" -+ - include "level3(ralt_switch)" - }; - -diff --git a/symbols/it b/symbols/it -index 3e402c9..9e6ed01 100644 ---- a/symbols/it -+++ b/symbols/it -@@ -33,6 +33,8 @@ xkb_symbols "basic" { - - key { [ less, greater,guillemotleft,guillemotright] }; - -+ include "kpdl(comma)" -+ - include "level3(ralt_switch)" - }; - -diff --git a/symbols/nl b/symbols/nl -index ff60dbb..d37ff27 100644 ---- a/symbols/nl -+++ b/symbols/nl -@@ -49,6 +49,8 @@ xkb_symbols "basic" { - - key { [bracketright, bracketleft, bar, brokenbar ] }; - -+ include "kpdl(comma)" -+ - include "level3(ralt_switch)" - }; - --- -1.8.4 - diff --git a/n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch b/n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch deleted file mode 100644 index cd06ea1..0000000 --- a/n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -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 ] }; // \ | - -- key { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // z -+ key { [ U0455, U0405, any,any ] }; // z - 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-2.11.tar.bz2 b/xkeyboard-config-2.11.tar.bz2 deleted file mode 100644 index 8e47445..0000000 --- a/xkeyboard-config-2.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76 -size 920222 diff --git a/xkeyboard-config-2.12.tar.bz2 b/xkeyboard-config-2.12.tar.bz2 new file mode 100644 index 0000000..f96d120 --- /dev/null +++ b/xkeyboard-config-2.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44 +size 934200 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 04d70ba..7b9e6d3 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 4 09:39:03 UTC 2014 - sndirsch@suse.com + +- Update to version 2.12 + * bugfix release + * supersedes U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch +- remove n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch, + which is considered wrong (bnc#68754) + ------------------------------------------------------------------- Tue Feb 4 15:06:41 UTC 2014 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index d7d055d..7051823 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -28,14 +28,12 @@ Url: http://www.freedesktop.org/Software/XKeyboardConfig Provides: XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm -Version: 2.11 +Version: 2.12 Release: 0 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/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2 -Patch0: n_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch -Patch1: U_Let-KPDL-key-on-it-fr-and-nl-keyboards-generate-KP_S.patch 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 @@ -55,8 +53,6 @@ make keyboards more accessible to people with physical impairments. %prep %setup -q translation-update-upstream -%patch0 -p1 -%patch1 -p1 -R %patch100 -p1 %patch109 -p1