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

Proposed by James M. Leddy on 2013-10-01
Status: Merged
Approved by: Sebastien Bacher on 2013-11-06
Approved revision: 83
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~jm-leddy/ubuntu/precise/xkeyboard-config/micmute
Merge into: lp:ubuntu/precise-proposed/xkeyboard-config
Diff against target: 95 lines (+33/-37)
4 files modified
debian/changelog (+8/-0)
debian/patches/114_shift_f10.patch (+0/-36)
debian/patches/115_add_XF86AudioMicMute.patch (+24/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~jm-leddy/ubuntu/precise/xkeyboard-config/micmute
Reviewer Review Type Date Requested Status
Ubuntu branches 2013-10-01 Pending
Review via email: mp+188678@code.launchpad.net

This proposal supersedes a proposal from 2013-10-01.

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

uploaded, thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-24 15:53:31 +0000
3+++ debian/changelog 2013-10-01 18:20:54 +0000
4@@ -1,3 +1,11 @@
5+xkeyboard-config (2.5-1ubuntu1.5) precise-proposed; urgency=low
6+
7+ * Revert last commit due to a SRU verification failure.
8+ * Add patch 115_add_XF86AudioMicMute.patch. This maps F20 to the new
9+ XF86AudioMicMute keysym. Cherrypick from upstream. (LP: #408903)
10+
11+ -- James M Leddy <james.leddy@canonical.com> Fri, 31 May 2013 15:39:35 -0400
12+
13 xkeyboard-config (2.5-1ubuntu1.4) precise-proposed; urgency=low
14
15 * Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else
16
17=== removed file 'debian/patches/114_shift_f10.patch'
18--- debian/patches/114_shift_f10.patch 2012-09-24 15:53:31 +0000
19+++ debian/patches/114_shift_f10.patch 1970-01-01 00:00:00 +0000
20@@ -1,36 +0,0 @@
21-commit a4f62448819764f6f27ebcb86115734d0d57ea8d
22-Author: Sergey V. Udaltsov <svu@gnome.org>
23-Date: Sun Sep 2 08:57:52 2012 +0100
24-
25- Fixed Shift-F10 behaviour
26-
27- Preserving shift is essential for many applications
28- https://bugs.freedesktop.org/show_bug.cgi?id=45008
29-
30-diff --git a/types/pc b/types/pc
31-index 01a5634..daebe74 100644
32---- a/types/pc
33-+++ b/types/pc
34-@@ -59,17 +59,19 @@ partial default xkb_types "default" {
35- };
36-
37- type "CTRL+ALT" {
38-- modifiers = Control+Alt+Shift+LevelThree;
39-+ modifiers = Control+Alt+Shift+LevelThree;
40- map[None] = Level1;
41- map[Shift] = Level2;
42- map[LevelThree] = Level3;
43- map[Shift+LevelThree] = Level4;
44-- map[Control+Alt] = Level5;
45-+ map[Control+Alt] = Level5;
46-+ preserve[Shift] = Shift;
47-+ preserve[Shift+LevelThree] = Shift;
48- level_name[Level1] = "Base";
49- level_name[Level2] = "Shift";
50- level_name[Level3] = "Alt Base";
51- level_name[Level4] = "Shift Alt";
52-- level_name[Level5] = "Ctrl+Alt";
53-+ level_name[Level5] = "Ctrl+Alt";
54- };
55-
56- // Local eight level
57
58=== added file 'debian/patches/115_add_XF86AudioMicMute.patch'
59--- debian/patches/115_add_XF86AudioMicMute.patch 1970-01-01 00:00:00 +0000
60+++ debian/patches/115_add_XF86AudioMicMute.patch 2013-10-01 18:20:54 +0000
61@@ -0,0 +1,24 @@
62+From 4e648ea02ce68e404faa0c99118e4d11a64f74a7 Mon Sep 17 00:00:00 2001
63+From: James M Leddy <jm.leddy@gmail.com>
64+Date: Mon, 13 May 2013 18:08:24 +0000
65+Subject: Add XF86AudioMicMute mappings
66+
67+https://bugs.freedesktop.org/show_bug.cgi?id=54171
68+
69+Signed-off-by: James M Leddy <jm.leddy@gmail.com>
70+---
71+diff --git a/symbols/inet b/symbols/inet
72+index 4c172fa..839439a 100644
73+--- a/symbols/inet
74++++ b/symbols/inet
75+@@ -120,6 +120,8 @@ xkb_symbols "evdev" {
76+ key <FK22> { [ XF86TouchpadOn ] };
77+ key <FK23> { [ XF86TouchpadOff ] };
78+
79++ key <FK20> { [ XF86AudioMicMute ] };
80++
81+ // key <I120> { [ ] }; // KEY_MACRO
82+ key <I126> { [ plusminus ] };
83+ key <I128> { [ XF86LaunchA ] };
84+--
85+cgit v0.9.0.2-2-gbebe
86
87=== modified file 'debian/patches/series'
88--- debian/patches/series 2012-09-24 15:53:31 +0000
89+++ debian/patches/series 2013-10-01 18:20:54 +0000
90@@ -7,4 +7,4 @@
91 111_cz_ssharp.patch
92 112_dk_dvorak_tilde.patch
93 113_ossmath_is_five_levels.patch
94-114_shift_f10.patch
95+115_add_XF86AudioMicMute.patch

Subscribers

People subscribed via source and target branches