Debian packaging fixes.

diff --git a/debian/changelog b/debian/changelog
index 6938964040d24f427874086e64aff5b6667e4e98..3c98631a7bf49566e811e42ccc788aef3a46a7fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dnsmasq (2.70-2) unstable; urgency=low
+
+   * Ensure daemon not stared if dnsmasq package has been removed,
+     even if dnsmasq-base is still installed. (closes: #746941)
+   * Tidy cruft in initscript. (closes: #746940)
+
+ -- Simon Kelley <simon@thekelleys.org.uk>  Sun, 04 May 2014 21:34:11 +0000
+
 dnsmasq (2.70-1) unstable; urgency=low
 
    * New upstream.

diff --git a/debian/init b/debian/init
index 6f35dd113f068018802c7da2838f600c45a779a2..3db7dcab2fbf4d05043c8e4d6356b3652de75005 100644 (file)
--- a/debian/init
+++ b/debian/init
@@ -29,6 +29,12 @@ if [ -r /etc/default/locale ]; then
         export LANG
 fi
 
+# /etc/dnsmasq.d/README is a non-conffile installed by the dnsmasq package.
+# Should the dnsmasq package be removed, the following test ensures that
+# the daemon is no longer started, even if the dnsmasq-base package is
+# still in place.
+test -e /etc/dnsmasq.d/README || exit 0
+
 test -x $DAEMON || exit 0
 
 # Provide skeleton LSB log functions for backports which don't have LSB functions.
@@ -152,9 +158,6 @@ stop()
        #   2 if daemon could not be stopped
        #   other if a failure occurred
        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /var/run/dnsmasq/$NAME.pid --name $NAME
-       RETVAL="$?"
-       [ "$RETVAL" = 2 ] && return 2
-       return "$RETVAL"
 }
 
 stop_resolvconf()