Le vendredi 14 décembre 2012 à 21:28 +0100, Sébastien Villemot a écrit : > This is actually an xkb-data bug that has been fixed upstream and for which I attach the > relevant patch. Attaching the missing patch, sorry. -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
diff -u xkeyboard-config-2.5.1/debian/changelog xkeyboard-config-2.5.1/debian/changelog
--- xkeyboard-config-2.5.1/debian/changelog
+++ xkeyboard-config-2.5.1/debian/changelog
@@ -1,3 +1,14 @@
+xkeyboard-config (2.5.1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add ossmath-is-five-levels.patch: some keymaps like fr/oss and fr/bepo
+ 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 fixes this by adding the 5th level to the ossmath
+ definition. (Closes: #657440)
+
+ -- Sébastien Villemot <sebastien@debian.org> Thu, 13 Dec 2012 21:29:57 +0100
+
xkeyboard-config (2.5.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u xkeyboard-config-2.5.1/debian/patches/series xkeyboard-config-2.5.1/debian/patches/series
--- xkeyboard-config-2.5.1/debian/patches/series
+++ xkeyboard-config-2.5.1/debian/patches/series
@@ -3,0 +4 @@
+ossmath-is-five-levels.diff
only in patch2:
unchanged:
--- xkeyboard-config-2.5.1.orig/debian/patches/ossmath-is-five-levels.diff
+++ xkeyboard-config-2.5.1/debian/patches/ossmath-is-five-levels.diff
@@ -0,0 +1,36 @@
+Description: ossmath is CTRL+ALT, not FOUR_LEVEL
+ 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.
+Origin: http://cgit.freedesktop.org/xkeyboard-config/commit/?id=49ed96928f6036bf07c8daa5aa886485fc3635e4
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43541
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657440
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xkeyboard-config/+bug/985065
+Reviewed-by: Sébastien Villemot <sebastien@debian.org>
+Last-Update: 2012-12-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- 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
+
Attachment:
signature.asc
Description: This is a digitally signed message part