debian/changelog | 9 +++++++++ debian/patches/114_shift_f10.patch | 36 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+)
New commits: commit 48ca382473ee4f3e6ef9323ff85e717466e26f3b Author: Bryce Harrington <[email protected]> Date: Mon Sep 24 15:50:01 2012 -0700 cl diff --git a/debian/changelog b/debian/changelog index 6937286..d137168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xkeyboard-config (2.5-1ubuntu7) UNRELEASED; urgency=low +xkeyboard-config (2.5-1ubuntu7) quantal; urgency=low * Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else it causes Shift-F10 to be treated as F10. This can result in popup commit 36e3ba8adb116038a48eeb10075188e2435722c6 Author: Bryce Harrington <[email protected]> Date: Mon Sep 24 15:25:34 2012 -0700 Add patch to fix F10 menu misbehaviors diff --git a/debian/changelog b/debian/changelog index 3dbddef..6937286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xkeyboard-config (2.5-1ubuntu7) UNRELEASED; urgency=low + + * Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else + it causes Shift-F10 to be treated as F10. This can result in popup + menus opening when they shouldn't. + (LP: #937822) + + -- Bryce Harrington <[email protected]> Mon, 24 Sep 2012 15:19:25 -0700 + xkeyboard-config (2.5-1ubuntu6) quantal; urgency=low * Disable patch 109. The fix causes behavioral changes for right diff --git a/debian/patches/114_shift_f10.patch b/debian/patches/114_shift_f10.patch new file mode 100644 index 0000000..ff2685b --- /dev/null +++ b/debian/patches/114_shift_f10.patch @@ -0,0 +1,36 @@ +commit a4f62448819764f6f27ebcb86115734d0d57ea8d +Author: Sergey V. Udaltsov <[email protected]> +Date: Sun Sep 2 08:57:52 2012 +0100 + + Fixed Shift-F10 behaviour + + Preserving shift is essential for many applications + https://bugs.freedesktop.org/show_bug.cgi?id=45008 + +diff --git a/types/pc b/types/pc +index 01a5634..daebe74 100644 +--- a/types/pc ++++ b/types/pc +@@ -59,17 +59,19 @@ partial default xkb_types "default" { + }; + + type "CTRL+ALT" { +- modifiers = Control+Alt+Shift+LevelThree; ++ modifiers = Control+Alt+Shift+LevelThree; + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; +- map[Control+Alt] = Level5; ++ map[Control+Alt] = Level5; ++ preserve[Shift] = Shift; ++ preserve[Shift+LevelThree] = Shift; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; +- level_name[Level5] = "Ctrl+Alt"; ++ level_name[Level5] = "Ctrl+Alt"; + }; + + // Local eight level diff --git a/debian/patches/series b/debian/patches/series index ba3a198..d5b86b0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ revert-goodmap-badmap-for-apple.diff 111_cz_ssharp.patch 112_dk_dvorak_tilde.patch 113_ossmath_is_five_levels.patch +114_shift_f10.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
