Package: iio-sensor-proxy
Followup-For: Bug #852597

The patch...

-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages iio-sensor-proxy depends on:
ii  libc6           2.24-9
ii  libglib2.0-0    2.50.2-2
ii  libgudev-1.0-0  230-3
ii  systemd         232-14

iio-sensor-proxy recommends no packages.

iio-sensor-proxy suggests no packages.

-- no debconf information
diff -Nru iio-sensor-proxy-2.0/debian/changelog 
iio-sensor-proxy-2.0/debian/changelog
--- iio-sensor-proxy-2.0/debian/changelog       2016-12-21 18:02:51.000000000 
+0100
+++ iio-sensor-proxy-2.0/debian/changelog       2017-01-25 16:48:47.000000000 
+0100
@@ -1,3 +1,12 @@
+iio-sensor-proxy (2.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Mask and unmask iio-sensor-proxy service during upgrade to avoid dbus
+    restarting the daemon at the wrong time, copied from ModemManager (Closes:
+    #852597)
+
+ -- Laurent Bigonville <bi...@debian.org>  Wed, 25 Jan 2017 16:48:47 +0100
+
 iio-sensor-proxy (2.0-1) unstable; urgency=medium
 
   * [e44c466] New upstream version 2.0
diff -Nru iio-sensor-proxy-2.0/debian/control 
iio-sensor-proxy-2.0/debian/control
--- iio-sensor-proxy-2.0/debian/control 2016-12-20 19:23:53.000000000 +0100
+++ iio-sensor-proxy-2.0/debian/control 2017-01-25 16:11:00.000000000 +0100
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Ritesh Raj Sarraf <r...@debian.org>
-Build-Depends: debhelper (>= 9.20120312), libgudev-1.0-dev, udev, systemd, 
gtk-doc-tools (>= 1.0), libgtk-3-dev
+Build-Depends: debhelper (>= 9.20160709), libgudev-1.0-dev, udev, systemd, 
gtk-doc-tools (>= 1.0), libgtk-3-dev
 Standards-Version: 3.9.8
 Homepage: https://github.com/hadess/iio-sensor-proxy
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/iio-sensor-proxy
diff -Nru iio-sensor-proxy-2.0/debian/postrm iio-sensor-proxy-2.0/debian/postrm
--- iio-sensor-proxy-2.0/debian/postrm  1970-01-01 01:00:00.000000000 +0100
+++ iio-sensor-proxy-2.0/debian/postrm  2017-01-25 16:43:46.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# drop the temporary mask from prerm
+if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
+    systemctl unmask --runtime iio-sensor-proxy.service
+fi
+
+#DEBHELPER#
diff -Nru iio-sensor-proxy-2.0/debian/prerm iio-sensor-proxy-2.0/debian/prerm
--- iio-sensor-proxy-2.0/debian/prerm   1970-01-01 01:00:00.000000000 +0100
+++ iio-sensor-proxy-2.0/debian/prerm   2017-01-25 16:44:40.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# avoid cancelling of "stop" when D-BUS reactivates iio-sensor-proxy
+if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
+    systemctl mask --runtime iio-sensor-proxy.service
+fi
+
+#DEBHELPER#
diff -Nru iio-sensor-proxy-2.0/debian/rules iio-sensor-proxy-2.0/debian/rules
--- iio-sensor-proxy-2.0/debian/rules   2016-12-20 19:23:53.000000000 +0100
+++ iio-sensor-proxy-2.0/debian/rules   2017-01-25 16:48:07.000000000 +0100
@@ -8,7 +8,10 @@
 export DH_OPTIONS
 
 %:
-       dh $@ 
+       dh $@  --with systemd
+
+override_dh_systemd_start:
+       dh_systemd_start --no-start --no-restart-on-upgrade
 
 #override_dh_auto_configure:
 #      ./autogen.sh --prefix=/ --exec-prefix=/usr

Reply via email to