Merge 2.76-1.2 Debian NMU.

debian/changelog

@@ -4,6 +4,14 @@ dnsmasq (2.77-1) unstable; urgency=low
 
  -- Simon Kelley <simon@thekelleys.org.uk>  Wed, 6 Jul 2016 22:22:10 +0000
 
+dnsmasq (2.76-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * dnsmasq: Install marker file to determine package installed state,
+    for the benefit of the init script. (Closes: #819856)
+
+ -- Christian Hofstaedtler <zeha@debian.org>  Sat, 16 Jul 2016 00:17:57 +0000
+
 dnsmasq (2.76-1.1) unstable; urgency=medium
 
    * Non-maintainer upload.

debian/init

@@ -33,7 +33,7 @@ fi
 # The following test ensures the dnsmasq service is not started, when the
 # package 'dnsmasq' is removed but not purged, even if the dnsmasq-base 
 # package is still in place.
-test -d /usr/share/doc/dnsmasq || exit 0
+test -e /usr/share/dnsmasq/installed-marker || exit 0
  
 test -x $DAEMON || exit 0
 

debian/installed-marker

+# This file indicates dnsmasq (and not just dnsmasq-base) is installed.
+# It is an implementation detail of the dnsmasq init script.

debian/rules

@@ -105,6 +105,7 @@ binary-indep:	checkroot
 		-d debian/daemon/etc/dnsmasq.d \
 	        -d debian/daemon/etc/resolvconf/update.d \
 		-d debian/daemon/usr/lib/resolvconf/dpkg-event.d \
+		-d debian/daemon/usr/share/dnsmasq \
 	        -d debian/daemon/etc/default \
 		-d debian/daemon/lib/systemd/system \
                 -d debian/daemon/etc/insserv.conf.d
@@ -113,6 +114,7 @@ binary-indep:	checkroot
 	install -m 755 debian/init debian/daemon/etc/init.d/dnsmasq
 	install -m 755 debian/resolvconf debian/daemon/etc/resolvconf/update.d/dnsmasq
 	install -m 755 debian/resolvconf-package debian/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
+	install -m 644 debian/installed-marker debian/daemon/usr/share/dnsmasq
 	install -m 644 debian/default debian/daemon/etc/default/dnsmasq
 	install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
 	install -m 644 debian/readme.dnsmasq.d debian/daemon/etc/dnsmasq.d/README