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
XF86keysym.h (+2/-0)
debian/changelog (+8/-0)
debian/patches/0001-Add-XF86XK_AudioMicMute.patch (+26/-0)
debian/patches/series (+1/-1)
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
210#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */210#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
211#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */211#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
212212
213#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
214
213/* Keys for special action keys (hot keys) */215/* Keys for special action keys (hot keys) */
214/* Virtual terminals on some operating systems */216/* Virtual terminals on some operating systems */
215#define XF86XK_Switch_VT_1 0x1008FE01217#define XF86XK_Switch_VT_1 0x1008FE01
216218
=== 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 @@
1x11proto-core (7.0.22-1ubuntu1) precise-proposed; urgency=low
2
3 * Add 0001-Add-XF86XK_AudioMicMute.patch:
4 - Backport commit f1b8b4dd from upstream. This adds a key that
5 is used on some thinkpad keyboards. Fixes (LP: #408903)
6
7 -- James M Leddy <james.leddy@canonical.com> Thu, 30 May 2013 20:11:37 -0400
8
1x11proto-core (7.0.22-1) unstable; urgency=low9x11proto-core (7.0.22-1) unstable; urgency=low
210
3 * New upstream release.11 * New upstream release.
412
=== 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 @@
1From f1b8b4dd5e798b7e91da95eca997ec7236fcbc27 Mon Sep 17 00:00:00 2001
2From: James M Leddy <james.leddy@canonical.com>
3Date: Wed, 09 May 2012 19:45:01 +0000
4Subject: Add XF86XK_AudioMicMute
5
6Lenovo Thinkpad machines have a microphone mute in addition to the
7standard audio output mute.
8
9Signed-off-by: James M. Leddy <james.leddy@canonical.com>
10Signed-off-by: James Cloos <cloos@jhcloos.com>
11---
12diff --git a/XF86keysym.h b/XF86keysym.h
13index df5e9cc..93eb062 100644
14--- a/XF86keysym.h
15+++ b/XF86keysym.h
16@@ -210,6 +210,8 @@
17 #define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
18 #define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
19
20+#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
21+
22 /* Keys for special action keys (hot keys) */
23 /* Virtual terminals on some operating systems */
24 #define XF86XK_Switch_VT_1 0x1008FE01
25--
26cgit v0.9.0.2-2-gbebe
027
=== 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 @@
1# placeholder10001-Add-XF86XK_AudioMicMute.patch

Subscribers

People subscribed via source and target branches