Merge lp:~apw/udev/volume-key-updates into lp:~ubuntu-core-dev/ubuntu/natty/udev/ubuntu

Proposed by Andy Whitcroft on 2010-11-25
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~apw/udev/volume-key-updates
Merge into: lp:~ubuntu-core-dev/ubuntu/natty/udev/ubuntu
Diff against target: 42 lines (+18/-1)
2 files modified
debian/changelog (+13/-0)
extras/keymap/95-keyboard-force-release.rules (+5/-1)
To merge this branch: bzr merge lp:~apw/udev/volume-key-updates
Reviewer Review Type Date Requested Status
Martin Pitt 2010-11-25 Approve on 2010-11-26
Review via email: mp+41870@code.launchpad.net

Description of the change

Pull in three volume key quirks we are carrying as an out of tree kernel patch. With the generic support there is no point in trying to merge this patch upstream, support should flow into udev instead. This branch represents these pending quirks. Kernel patch is available for comparison on the branch description.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks! I pushed this to upstream git, from where it'll flow to Ubuntu in the next release.

review: Approve

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 2010-11-12 17:35:59 +0000
3+++ debian/changelog 2010-11-25 15:32:32 +0000
4@@ -1,3 +1,16 @@
5+udev (164-4) UNRELEASED; urgency=low
6+
7+ [ Andy Whitcroft ]
8+
9+ * extras/keymap/95-keyboard-force-release.rules: Zepto Znote 6615WD requires
10+ volume key releases.
11+ * extras/keymap/95-keyboard-force-release.rules: Zepto Znote 6625WD requires
12+ volume key releases.
13+ * extras/keymap/95-keyboard-force-release.rules: AMILO Xi 2428 requires
14+ volume key releases.
15+
16+ -- Andy Whitcroft <apw@canonical.com> Thu, 25 Nov 2010 15:15:35 +0000
17+
18 udev (164-3) natty; urgency=low
19
20 * debian/udev.initramfs-hook: If /sbin/udevadm.upgrade exists, copy that
21
22=== modified file 'extras/keymap/95-keyboard-force-release.rules'
23--- extras/keymap/95-keyboard-force-release.rules 2010-10-26 16:17:20 +0000
24+++ extras/keymap/95-keyboard-force-release.rules 2010-11-25 15:32:32 +0000
25@@ -23,7 +23,7 @@
26
27 ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
28
29-ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
30+ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u|AMILO Xi 2428", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
31
32 ENV{DMI_VENDOR}=="FOXCONN", ATTR{[dmi/id]product_name}=="QBOOK", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
33
34@@ -35,4 +35,8 @@
35
36 ENV{DMI_VENDOR}=="Viooo Corporation", ATTR{[dmi/id]product_name}=="PT17", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
37
38+ENV{DMI_VENDOR}=="Zepto", ATTR{[dmi/id]product_name}=="Znote 6615WD", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
39+
40+ENV{DMI_VENDOR}=="Zepto", ATTR{[dmi/id]product_name}=="Znote", ATTR{[dmi/id]product_version}=="6625WD", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
41+
42 LABEL="force_release_end"

Subscribers

People subscribed via source and target branches