From 9bb3998da4c1ebedde83a44ba8bbe30b65b2660a Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sat, 16 Jul 2016 22:06:01 +0100 Subject: [PATCH] Merge 2.76-1.2 Debian NMU. --- debian/changelog | 8 ++++++++ debian/init | 2 +- debian/installed-marker | 2 ++ debian/rules | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/installed-marker diff --git a/debian/changelog b/debian/changelog index 0fa6e21..1a3be9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,14 @@ dnsmasq (2.77-1) unstable; urgency=low -- Simon Kelley 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 Sat, 16 Jul 2016 00:17:57 +0000 + dnsmasq (2.76-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/init b/debian/init index 10b277c..8c562de 100644 --- a/debian/init +++ b/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 diff --git a/debian/installed-marker b/debian/installed-marker new file mode 100644 index 0000000..8579a95 --- /dev/null +++ b/debian/installed-marker @@ -0,0 +1,2 @@ +# This file indicates dnsmasq (and not just dnsmasq-base) is installed. +# It is an implementation detail of the dnsmasq init script. diff --git a/debian/rules b/debian/rules index d748829..ce34312 100755 --- a/debian/rules +++ b/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