Merge lp:~xnox/update-notifier/lp1409129 into lp:update-notifier/ubuntu

[Dimitri John Ledkov]

Prepare for udev-bridge on the session bus.

Prepare for udev-bridge on the session bus.

[Martin Pitt (pitti)]

That'll be for the "no-classes" change in https://code.launchpad.net/~xnox/upstart/no-classes/+merge/245948, right? LGTM, thanks!

review: Approve

=== modified file 'debian/update-notifier-cds.conf'
--- debian/update-notifier-cds.conf	2014-12-10 20:41:46 +0000
+++ debian/update-notifier-cds.conf	2015-01-09 21:24:58 +0000
@@ -3,7 +3,9 @@
 
 start on (
     :sys:block-device-changed ID_FS_TYPE=iso9660 or
-    :sys:block-device-added ID_FS_TYPE=iso9660
+    :sys:block-device-added ID_FS_TYPE=iso9660 or
+    block-device-changed ID_FS_TYPE=iso9660 or
+    block-device-added ID_FS_TYPE=iso9660
 )
 
 
 
=== modified file 'debian/update-notifier-hp-firmware.conf'
--- debian/update-notifier-hp-firmware.conf	2013-02-22 21:44:37 +0000
+++ debian/update-notifier-hp-firmware.conf	2015-01-09 21:24:58 +0000
@@ -4,7 +4,9 @@
 # only idVendor=03f0, idProduct="??{17,2a}" requires firmware
 start on (
     :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??17 or
-    :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a
+    :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a or
+    usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??17 or
+    usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a
 )
 
 script