Merge lp:~mdeslaur/usb-creator/lp1497569 into lp:usb-creator

[Marc Deslauriers]

Unmerged revisions

473. By Marc Deslauriers on 2015-09-25

debian/usb-creator-common.postinst, debian/usb-creator-common.prerm:
stop usb-creator-helper on package upgrades and removals.
(LP: #1497569)

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-19 01:27:48 +0000
+++ debian/changelog	2015-09-25 19:06:44 +0000
@@ -11,6 +11,9 @@
       proper polkit integration for KVM use.
     - CVE number pending
   * usbcreator/backends/udisks/backend.py: fix --show-all (LP: #1497431)
+  * debian/usb-creator-common.postinst, debian/usb-creator-common.prerm:
+    stop usb-creator-helper on package upgrades and removals.
+    (LP: #1497569)
 
   [ Mathieu Trudel-Lapierre ]
   * usbcreator/install.py: remove the directories known to normally contain
@@ -18,7 +21,7 @@
     squashfs from desktop is still under casper/ after copying server files
     to a USB key. (LP: #1450597)
 
- -- Marc Deslauriers <[e-mail]>  Fri, 18 Sep 2015 21:24:20 -0400
+ -- Marc Deslauriers <[e-mail]>  Fri, 25 Sep 2015 15:01:19 -0400
 
 usb-creator (0.2.67) vivid; urgency=medium
 

=== added file 'debian/usb-creator-common.postinst'
--- debian/usb-creator-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/usb-creator-common.postinst	2015-09-25 19:06:44 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+get_pid() {
+    [ -n "$1" ] || return 0
+    [ -S /var/run/dbus/system_bus_socket ] || return 0
+
+    dbus-send --system --dest=org.freedesktop.DBus --print-reply \
+              /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \
+              string:$1 2>/dev/null | awk '/uint32/ {print $2}'
+}
+
+if [ "$1" = "configure" ]; then
+    # stop usb-creator-helper
+    kill $(get_pid com.ubuntu.USBCreator) 2>/dev/null || true
+fi
+
+#DEBHELPER#

=== added file 'debian/usb-creator-common.prerm'
--- debian/usb-creator-common.prerm	1970-01-01 00:00:00 +0000
+++ debian/usb-creator-common.prerm	2015-09-25 19:06:44 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+get_pid() {
+    [ -n "$1" ] || return 0
+    [ -S /var/run/dbus/system_bus_socket ] || return 0
+
+    dbus-send --system --dest=org.freedesktop.DBus --print-reply \
+              /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \
+              string:$1 2>/dev/null | awk '/uint32/ {print $2}'
+}
+
+if [ "$1" = "remove" ]; then
+    # stop usb-creator-helper
+    kill $(get_pid com.ubuntu.USBCreator) 2>/dev/null || true
+fi
+
+#DEBHELPER#