Merge lp:~jm-leddy/ubuntu/precise/xkeyboard-config/micmute into lp:ubuntu/precise-proposed/xkeyboard-config

[James M. Leddy]

Support the Mic Mute key present on Thinkpad machines and soon to be present on newer Dell and HP laptops.

[Sebastien Bacher (seb128)]

uploaded, thanks

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-24 15:53:31 +0000
+++ debian/changelog	2013-10-01 18:20:54 +0000
@@ -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 <[e-mail]>  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

=== removed file 'debian/patches/114_shift_f10.patch'
--- debian/patches/114_shift_f10.patch	2012-09-24 15:53:31 +0000
+++ debian/patches/114_shift_f10.patch	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-commit a4f62448819764f6f27ebcb86115734d0d57ea8d
-Author: Sergey V. Udaltsov <[e-mail]>
-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

=== added file 'debian/patches/115_add_XF86AudioMicMute.patch'
--- debian/patches/115_add_XF86AudioMicMute.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/115_add_XF86AudioMicMute.patch	2013-10-01 18:20:54 +0000
@@ -0,0 +1,24 @@
+From 4e648ea02ce68e404faa0c99118e4d11a64f74a7 Mon Sep 17 00:00:00 2001
+From: James M Leddy <[e-mail]>
+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 <[e-mail]>
+---
+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 <FK22>   {      [ XF86TouchpadOn        ]       };
+     key <FK23>   {      [ XF86TouchpadOff       ]       };
+ 
++    key <FK20>   {      [ XF86AudioMicMute      ]       };
++
+ //  key <I120>   {      [ ]       }; // KEY_MACRO 
+     key <I126>   {      [ plusminus             ]       };
+     key <I128>   {      [ XF86LaunchA           ]       };
+--
+cgit v0.9.0.2-2-gbebe

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-24 15:53:31 +0000
+++ debian/patches/series	2013-10-01 18:20:54 +0000
@@ -7,4 +7,4 @@
 111_cz_ssharp.patch
 112_dk_dvorak_tilde.patch
 113_ossmath_is_five_levels.patch
-114_shift_f10.patch
+115_add_XF86AudioMicMute.patch