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

[Andy Whitcroft]

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.

[Martin Pitt (pitti)]

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

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-12 17:35:59 +0000
+++ debian/changelog	2010-11-25 15:32:32 +0000
@@ -1,3 +1,16 @@
+udev (164-4) UNRELEASED; urgency=low
+
+  [ Andy Whitcroft ]
+
+  * extras/keymap/95-keyboard-force-release.rules: Zepto Znote 6615WD requires
+    volume key releases.
+  * extras/keymap/95-keyboard-force-release.rules: Zepto Znote 6625WD requires
+    volume key releases.
+  * extras/keymap/95-keyboard-force-release.rules: AMILO Xi 2428 requires
+    volume key releases.
+
+ -- Andy Whitcroft <[e-mail]>  Thu, 25 Nov 2010 15:15:35 +0000
+
 udev (164-3) natty; urgency=low
 
   * debian/udev.initramfs-hook: If /sbin/udevadm.upgrade exists, copy that

=== modified file 'extras/keymap/95-keyboard-force-release.rules'
--- extras/keymap/95-keyboard-force-release.rules	2010-10-26 16:17:20 +0000
+++ extras/keymap/95-keyboard-force-release.rules	2010-11-25 15:32:32 +0000
@@ -23,7 +23,7 @@
 
 ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
 
-ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
+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"
 
 ENV{DMI_VENDOR}=="FOXCONN", ATTR{[dmi/id]product_name}=="QBOOK", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
 
@@ -35,4 +35,8 @@
 
 ENV{DMI_VENDOR}=="Viooo Corporation", ATTR{[dmi/id]product_name}=="PT17", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
 
+ENV{DMI_VENDOR}=="Zepto", ATTR{[dmi/id]product_name}=="Znote 6615WD", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
+
+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"
+
 LABEL="force_release_end"