diff -u xkeyboard-config-2.5/debian/changelog xkeyboard-config-2.5/debian/changelog --- xkeyboard-config-2.5/debian/changelog +++ xkeyboard-config-2.5/debian/changelog @@ -1,3 +1,11 @@ +xkeyboard-config (2.5-1ubuntu1.5) precise-proposed; urgency=low + + * Revert last commit due to a SRU verification failure. + * Add patch 115_add_XF86AudioMicMute.patch. This maps F20 to the new + XF86AudioMicMute keysym. Cherrypick from upstream. (LP: #408903) + + -- James M Leddy Fri, 31 May 2013 15:39:35 -0400 + xkeyboard-config (2.5-1ubuntu1.4) precise-proposed; urgency=low * Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else @@ -24,7 +32,7 @@ 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 - ssharp rather than quotedbl for the Czech layout. Cherrypick of + ssharp rather than quotedbl for the Czech layout. Cherrypick of patch from upstream. (LP: #953477) * Add 112_dk_dvorak_tilde.patch: Fix tilde key in the Danish Dvorak @@ -104,14 +112,14 @@ * Merge from Debian experimental. Remaining Ubuntu changes: + xkb-data-i18n.install, xkb-data.install, rules: Split out - xkb-data-i18n to be used by console-setup. + xkb-data-i18n to be used by console-setup. + 105_intelligent_keyboard.patch: Add support for the Intelligent - Keyboard K04 + Keyboard K04 + 108_fix_intltool_make_check.diff: Fix make check in the presence - of the quilt patch system. + of the quilt patch system. + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration - settings from dvorak-intl to dvorak-alt-intl to match rename in - xkeyboard-config 1.9. (LP: 742683) + settings from dvorak-intl to dvorak-alt-intl to match rename in + xkeyboard-config 1.9. (LP: 742683) * No need to build the pot file anymore, upstream version is used. * Fix dh_autoreconf override in rules (FTBFS). @@ -131,10 +139,10 @@ * Merge from Debian experimental. Remaining Ubuntu changes: + xkb-data-i18n.install, xkb-data.install, rules: Split out - xkb-data-i18n to be used by console-setup. + xkb-data-i18n to be used by console-setup. + rules: Generate pot file for translations during build + 105_intelligent_keyboard.patch: Add support for the Intelligent - Keyboard K04 + Keyboard K04 * debian/patches/108_taiwan.patch: * debian/patches/104_macbook_expose_and_dashboard.patch: * debian/patches/107_lao.patch: @@ -200,18 +208,18 @@ + Support for Kinesis keyboard geometry (LP: #393887) + Support for Apple Aluminium keyboards (LP: #696232) + Support for abnt2 keyboard, thinkpad variant for Lenovo 3000 v100 - laptops (LP: #359719) + laptops (LP: #359719) + Fix CapsLock misspelling (LP: #592448) - Remaining Ubuntu changes: + xkb-data-i18n.install, xkb-data.install, rules: Split out - xkb-data-i18n to be used by console-setup. + xkb-data-i18n to be used by console-setup. + rules: Generate pot file for translations during build + 104_macbook_expose_and_dashboard.patch: Add keycode definitions - required for Apples Expose & Dashboard keys (F3/F4). + required for Apples Expose & Dashboard keys (F3/F4). + 105_intelligent_keyboard.patch: Add support for the Intelligent - Keyboard K04 + Keyboard K04 + 107_lao.patch: New keyboard layout for Lao, implemented as - an alternative to the default one. + an alternative to the default one. + 108_taiwan.patch: New keyboard layouts for Taiwan. * Drop 102_mac_aliases.patch: This appears to have some side effects, and the patch was not taken by upstream because it was an incomplete @@ -1059,7 +1067,7 @@ + debian/patches/mac_swap_kp.diff + debian/patches/mac_nodeadkeys.diff - * debian/README.Debian: Replace its obsolete content by informations + * debian/README.Debian: Replace its obsolete content by informations to powerpc users. * debian/patches/fix_xkbcomp_crash.diff: New patch to fix an @@ -1279,0 +1288 @@ + diff -u xkeyboard-config-2.5/debian/patches/series xkeyboard-config-2.5/debian/patches/series --- xkeyboard-config-2.5/debian/patches/series +++ xkeyboard-config-2.5/debian/patches/series @@ -10 +10 @@ -114_shift_f10.patch +115_add_XF86AudioMicMute.patch reverted: --- xkeyboard-config-2.5/debian/patches/114_shift_f10.patch +++ xkeyboard-config-2.5.orig/debian/patches/114_shift_f10.patch @@ -1,36 +0,0 @@ -commit a4f62448819764f6f27ebcb86115734d0d57ea8d -Author: Sergey V. Udaltsov -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 only in patch2: unchanged: --- xkeyboard-config-2.5.orig/debian/patches/115_add_XF86AudioMicMute.patch +++ xkeyboard-config-2.5/debian/patches/115_add_XF86AudioMicMute.patch @@ -0,0 +1,24 @@ +From 4e648ea02ce68e404faa0c99118e4d11a64f74a7 Mon Sep 17 00:00:00 2001 +From: James M Leddy +Date: Mon, 13 May 2013 18:08:24 +0000 +Subject: Add XF86AudioMicMute mappings + +https://bugs.freedesktop.org/show_bug.cgi?id=54171 + +Signed-off-by: James M Leddy +--- +diff --git a/symbols/inet b/symbols/inet +index 4c172fa..839439a 100644 +--- a/symbols/inet ++++ b/symbols/inet +@@ -120,6 +120,8 @@ xkb_symbols "evdev" { + key { [ XF86TouchpadOn ] }; + key { [ XF86TouchpadOff ] }; + ++ key { [ XF86AudioMicMute ] }; ++ + // key { [ ] }; // KEY_MACRO + key { [ plusminus ] }; + key { [ XF86LaunchA ] }; +-- +cgit v0.9.0.2-2-gbebe