Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at 2013-09-02 15:02:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-28 21:22:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xkeyboard-config.new/xkeyboard-config.changes 2013-09-02 15:02:23.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 30 08:11:24 UTC 2013 - sndir...@suse.com + +- U_Add-missing-backslash-bar-mapping-on-us-internationa.patch + * Add missing backslash/bar mapping on "us" international + variants (fdo#68606, bnc#831823). +- U_ara-digits-Generate-arabic-script-digits-also-on-key.patch + * ara(digits): Generate arabic script digits also on keypad + (fdo#68650, bnc#831823) +- refreshed patches + +------------------------------------------------------------------- New: ---- U_Add-missing-backslash-bar-mapping-on-us-internationa.patch U_ara-digits-Generate-arabic-script-digits-also-on-key.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.NEQIZs/_old 2013-09-02 15:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.NEQIZs/_new 2013-09-02 15:02:24.000000000 +0200 @@ -35,6 +35,8 @@ Group: System/X11/Utilities Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2 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 # 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,6 +57,8 @@ %setup -q translation-update-upstream %patch0 -p5 +%patch11 -p1 +%patch12 -p1 %patch100 %patch109 -p1 ++++++ U_Add-missing-backslash-bar-mapping-on-us-internationa.patch ++++++ >From 3ee79efcad1fd85423cda2d1940cb6101c7b25ef Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndir...@suse.de> Date: Tue, 27 Aug 2013 14:50:03 +0200 Subject: [PATCH 1/2] Add missing backslash/bar mapping on "us" international variants (bfo#68606). https://bugs.freedesktop.org/show_bug.cgi?id=68606 Signed-off-by: Stefan Dirsch <sndir...@suse.de> --- symbols/us | 4 ++++ 1 file changed, 4 insertions(+) Index: xkeyboard-config-2.9/symbols/us =================================================================== --- xkeyboard-config-2.9.orig/symbols/us +++ xkeyboard-config-2.9/symbols/us @@ -132,6 +132,8 @@ xkb_symbols "intl" { key <AB10> { [ slash, question, questiondown, dead_hook ] }; key <BKSL> { [ backslash, bar, notsign, brokenbar ] }; + key <LSGT> { [ backslash, bar, backslash, bar ] }; + include "level3(ralt_switch)" }; @@ -186,6 +188,8 @@ xkb_symbols "alt-intl" { key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] }; key <AB10> { [ slash, question, dead_hook, dead_hook ] }; + key <LSGT> { [ backslash, bar, backslash, bar ] }; + include "level3(ralt_switch)" }; ++++++ U_ara-digits-Generate-arabic-script-digits-also-on-key.patch ++++++ >From fcb91cb1013cbdd87a6f77533f188d5934f24046 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndir...@suse.de> Date: Thu, 29 Aug 2013 13:17:50 +0200 Subject: [PATCH 2/2] ara(digits): Generate arabic script digits also on keypad (fdo#68650) Signed-off-by: Stefan Dirsch <sndir...@suse.de> --- symbols/ara | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/symbols/ara b/symbols/ara index c0d57ef..1944b25 100644 --- a/symbols/ara +++ b/symbols/ara @@ -100,6 +100,27 @@ xkb_symbols "azerty" { }; partial alphanumeric_keys +xkb_symbols "digits_KP" { + name[Group1]= "Arabic (digits_KP)"; + + // use arabic script digits on KP + + key <KP7> { [ KP_Home, 0x1000667 ] }; // + key <KP8> { [ KP_Up, 0x1000668 ] }; // + key <KP9> { [ KP_Prior, 0x1000669 ] }; // + + key <KP4> { [ KP_Left, 0x1000664 ] }; // + key <KP5> { [ KP_Begin, 0x1000665 ] }; // + key <KP6> { [ KP_Right, 0x1000666 ] }; // + + key <KP1> { [ KP_End, 0x1000661 ] }; // + key <KP2> { [ KP_Down, 0x1000662 ] }; // + key <KP3> { [ KP_Next, 0x1000663 ] }; // + + key <KP0> { [ KP_Insert, 0x1000660 ] }; // +}; + +partial alphanumeric_keys xkb_symbols "digits" { include "ara(basic)" name[Group1]= "Arabic (digits)"; @@ -116,6 +137,8 @@ xkb_symbols "digits" { key <AE08> { [ 0x1000668, asterisk ] }; key <AE09> { [ 0x1000669, parenright ] }; key <AE10> { [ 0x1000660, parenleft ] }; + + include "ara(digits_KP)" }; partial alphanumeric_keys -- 1.8.1.4 ++++++ disable-2xalt_2xctrl-toggle.diff ++++++ --- /var/tmp/diff_new_pack.NEQIZs/_old 2013-09-02 15:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.NEQIZs/_new 2013-09-02 15:02:24.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xkeyboard-config-2.1/rules/base.xml.in +Index: xkeyboard-config-2.9/rules/base.xml.in =================================================================== ---- xkeyboard-config-2.1.orig/rules/base.xml.in -+++ xkeyboard-config-2.1/rules/base.xml.in -@@ -4713,6 +4713,7 @@ +--- xkeyboard-config-2.9.orig/rules/base.xml.in ++++ xkeyboard-config-2.9/rules/base.xml.in +@@ -5612,6 +5612,7 @@ <_description>Right Alt (while pressed)</_description> </configItem> </option> @@ -10,7 +10,7 @@ <option> <configItem> <name>grp:lswitch</name> -@@ -4725,6 +4726,7 @@ +@@ -5624,6 +5625,7 @@ <_description>Left Win (while pressed)</_description> </configItem> </option> ++++++ p_suse.diff ++++++ --- /var/tmp/diff_new_pack.NEQIZs/_old 2013-09-02 15:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.NEQIZs/_new 2013-09-02 15:02:24.000000000 +0200 @@ -4,7 +4,7 @@ =================================================================== --- symbols/pc.orig +++ symbols/pc -@@ -34,9 +34,9 @@ xkb_symbols "pc105" { +@@ -29,9 +29,9 @@ xkb_symbols "pc105" { key <LWIN> { [ Super_L ] }; key <RTSH> { [ Shift_R ] }; @@ -16,11 +16,9 @@ key <MENU> { [ Menu ] }; -- Add Support ctrl-alt-backspace Server Termination. - -Index: xkeyboard-config-2.1/rules/evdev.m_s.part +Index: rules/evdev.m_s.part =================================================================== ---- 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) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
