debian/changelog | 11 ++++++ debian/patches/113_ossmath_is_five_levels.patch | 42 ++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 54 insertions(+)
New commits: commit 4b8b1ce524c915de9a2b226da869f526b15ad1f4 Author: Bryce Harrington <br...@canonical.com> Date: Mon Jun 25 17:33:02 2012 -0700 Add 113_ossmath_is_five_levels.patch diff --git a/debian/changelog b/debian/changelog index a85706f..4f8d26d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xkeyboard-config (2.5-1ubuntu1.3) precise-proposed; urgency=low + + * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to + load because they include ossmath (via keypad(oss)) which + misconfigures the keypad as 4-level when it should be 5-level. This + patch from upstream bugzilla fixes this by adding the 5th level to the + ossmath definition. + (LP: #985065) + + -- Bryce Harrington <br...@ubuntu.com> Mon, 25 Jun 2012 17:32:15 -0700 + xkeyboard-config (2.5-1ubuntu1.2) precise-proposed; urgency=low * Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to diff --git a/debian/patches/113_ossmath_is_five_levels.patch b/debian/patches/113_ossmath_is_five_levels.patch new file mode 100644 index 0000000..47765ea --- /dev/null +++ b/debian/patches/113_ossmath_is_five_levels.patch @@ -0,0 +1,42 @@ +From 98aba92ebb0720abfb4d676bdf29944decc6f7bf Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu, 21 Jun 2012 10:16:31 +1000 +Subject: [PATCH] symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (#43541) + +having KPMU defined as FOUR_LEVEL, with 4 symbols only, triggers an xkb +error when the keypad stuff picks up the CTRL+ALT (from x11) and waits for 5 +symbols instead. + +X.Org Bug 43541 <http://bugs.freedesktop.org/show_bug.cgi?id=43541> + +Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> +--- + symbols/keypad | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/symbols/keypad b/symbols/keypad +index 1bab391..b362ebc 100644 +--- a/symbols/keypad ++++ b/symbols/keypad +@@ -267,13 +267,12 @@ xkb_symbols "legacymath" { + partial keypad_keys + xkb_symbols "ossmath" { + +- key.type[Group1]="FOUR_LEVEL_X" ; +- +- key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab> +- key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab> +- key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode> ++ key.type[Group1]="CTRL+ALT" ; + +- key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode> ++ key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab> ++ key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab> ++ key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode> ++ key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode> + + }; + +-- +1.7.10.2 + diff --git a/debian/patches/series b/debian/patches/series index d4fe280..ded6420 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ revert-goodmap-badmap-for-apple.diff 110_dead_hook_horn.patch 111_cz_ssharp.patch 112_dk_dvorak_tilde.patch +113_ossmath_is_five_levels.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1sjjie-0007vy...@vasks.debian.org