Merge lp:~jm-leddy/ubuntu/precise/x11proto-core/micmute into lp:ubuntu/precise/x11proto-core

[James M. Leddy]

[Sebastien Bacher (seb128)]

Thanks, I've sponsored that one

=== modified file 'XF86keysym.h'
--- XF86keysym.h	2011-06-23 11:01:17 +0000
+++ XF86keysym.h	2013-06-05 19:02:27 +0000
@@ -210,6 +210,8 @@
 #define XF86XK_TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
 #define XF86XK_TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
 
+#define XF86XK_AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
+
 /* Keys for special action keys (hot keys) */
 /* Virtual terminals on some operating systems */
 #define XF86XK_Switch_VT_1	0x1008FE01
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-06-23 11:01:17 +0000
+++ debian/changelog	2013-06-05 19:02:27 +0000
@@ -1,3 +1,11 @@
+x11proto-core (7.0.22-1ubuntu1) precise-proposed; urgency=low
+
+  * Add 0001-Add-XF86XK_AudioMicMute.patch:
+    - Backport commit f1b8b4dd from upstream. This adds a key that
+      is used on some thinkpad keyboards. Fixes (LP: #408903)
+
+ -- James M Leddy <[e-mail]>  Thu, 30 May 2013 20:11:37 -0400
+
 x11proto-core (7.0.22-1) unstable; urgency=low
 
   * New upstream release.
 
=== added file 'debian/patches/0001-Add-XF86XK_AudioMicMute.patch'
--- debian/patches/0001-Add-XF86XK_AudioMicMute.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Add-XF86XK_AudioMicMute.patch	2013-06-05 19:02:27 +0000
@@ -0,0 +1,26 @@
+From f1b8b4dd5e798b7e91da95eca997ec7236fcbc27 Mon Sep 17 00:00:00 2001
+From: James M Leddy <[e-mail]>
+Date: Wed, 09 May 2012 19:45:01 +0000
+Subject: Add XF86XK_AudioMicMute
+
+Lenovo Thinkpad machines have a microphone mute in addition to the
+standard audio output mute.
+
+Signed-off-by: James M. Leddy <[e-mail]>
+Signed-off-by: James Cloos <[e-mail]>
+---
+diff --git a/XF86keysym.h b/XF86keysym.h
+index df5e9cc..93eb062 100644
+--- a/XF86keysym.h
++++ b/XF86keysym.h
+@@ -210,6 +210,8 @@
+ #define XF86XK_TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
+ #define XF86XK_TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
+ 
++#define XF86XK_AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
++
+ /* Keys for special action keys (hot keys) */
+ /* Virtual terminals on some operating systems */
+ #define XF86XK_Switch_VT_1	0x1008FE01
+--
+cgit v0.9.0.2-2-gbebe
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-23 11:01:17 +0000
+++ debian/patches/series	2013-06-05 19:02:27 +0000
@@ -1,1 +1,1 @@
-# placeholder
+0001-Add-XF86XK_AudioMicMute.patch