Ubuntu

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

Proposed by James M. Leddy on 2013-06-05
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jm-leddy/ubuntu/precise/x11proto-core/micmute
Merge into: lp:ubuntu/precise/x11proto-core
Diff against target: 66 lines (+37/-1) 4 files modified
To merge this branch: bzr merge lp:~jm-leddy/ubuntu/precise/x11proto-core/micmute
Reviewer Review Type Date Requested Status
Ubuntu branches 2013-06-05 Pending
Review via email: mp+167620@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks, I've sponsored that one

Preview Diff

1=== modified file 'XF86keysym.h'
2--- XF86keysym.h 2011-06-23 11:01:17 +0000
3+++ XF86keysym.h 2013-06-05 19:02:27 +0000
4@@ -210,6 +210,8 @@
5 #define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
6 #define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
7
8+#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
9+
10 /* Keys for special action keys (hot keys) */
11 /* Virtual terminals on some operating systems */
12 #define XF86XK_Switch_VT_1 0x1008FE01
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2011-06-23 11:01:17 +0000
16+++ debian/changelog 2013-06-05 19:02:27 +0000
17@@ -1,3 +1,11 @@
18+x11proto-core (7.0.22-1ubuntu1) precise-proposed; urgency=low
19+
20+ * Add 0001-Add-XF86XK_AudioMicMute.patch:
21+ - Backport commit f1b8b4dd from upstream. This adds a key that
22+ is used on some thinkpad keyboards. Fixes (LP: #408903)
23+
24+ -- James M Leddy <james.leddy@canonical.com> Thu, 30 May 2013 20:11:37 -0400
25+
26 x11proto-core (7.0.22-1) unstable; urgency=low
27
28 * New upstream release.
29
30=== added file 'debian/patches/0001-Add-XF86XK_AudioMicMute.patch'
31--- debian/patches/0001-Add-XF86XK_AudioMicMute.patch 1970-01-01 00:00:00 +0000
32+++ debian/patches/0001-Add-XF86XK_AudioMicMute.patch 2013-06-05 19:02:27 +0000
33@@ -0,0 +1,26 @@
34+From f1b8b4dd5e798b7e91da95eca997ec7236fcbc27 Mon Sep 17 00:00:00 2001
35+From: James M Leddy <james.leddy@canonical.com>
36+Date: Wed, 09 May 2012 19:45:01 +0000
37+Subject: Add XF86XK_AudioMicMute
38+
39+Lenovo Thinkpad machines have a microphone mute in addition to the
40+standard audio output mute.
41+
42+Signed-off-by: James M. Leddy <james.leddy@canonical.com>
43+Signed-off-by: James Cloos <cloos@jhcloos.com>
44+---
45+diff --git a/XF86keysym.h b/XF86keysym.h
46+index df5e9cc..93eb062 100644
47+--- a/XF86keysym.h
48++++ b/XF86keysym.h
49+@@ -210,6 +210,8 @@
50+ #define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
51+ #define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
52+
53++#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
54++
55+ /* Keys for special action keys (hot keys) */
56+ /* Virtual terminals on some operating systems */
57+ #define XF86XK_Switch_VT_1 0x1008FE01
58+--
59+cgit v0.9.0.2-2-gbebe
60
61=== modified file 'debian/patches/series'
62--- debian/patches/series 2011-06-23 11:01:17 +0000
63+++ debian/patches/series 2013-06-05 19:02:27 +0000
64@@ -1,1 +1,1 @@
65-# placeholder
66+0001-Add-XF86XK_AudioMicMute.patch

Subscribers

People subscribed via source and target branches