[Pkg-utopia-commits] r1911 - in /packages/unstable/avahi/debian: avahi-daemon.default avahi-daemon.init changelog

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Dec  5 09:51:34 2007
New Revision: 1911

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1911
Log:
Merge r1907 by mbiebl:
Deprecate the AVAHI_DAEMON_START option and remove it from
/etc/default/avahi-daemon. Print a warning message in the init script if
this option is still used.

Modified:
    packages/unstable/avahi/debian/avahi-daemon.default
    packages/unstable/avahi/debian/avahi-daemon.init
    packages/unstable/avahi/debian/changelog

Modified: packages/unstable/avahi/debian/avahi-daemon.default
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.default?rev=1911&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.default (original)
+++ packages/unstable/avahi/debian/avahi-daemon.default Wed Dec  5 09:51:34 2007
@@ -1,6 +1,3 @@
-# 0 = don't start, 1 = start
-AVAHI_DAEMON_START=1
-
 # 1 = Try to detect unicast dns servers that serve .local and disable avahi in
 # that case, 0 = Don't try to detect .local unicast dns servers, can cause
 # troubles on misconfigured networks

Modified: packages/unstable/avahi/debian/avahi-daemon.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.init?rev=1911&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.init (original)
+++ packages/unstable/avahi/debian/avahi-daemon.init Wed Dec  5 09:51:34 2007
@@ -25,15 +25,15 @@
 
 . /lib/lsb/init-functions
 
-# don't start if /etc/default/avahi-daemon says so.
-AVAHI_DAEMON_START=1
+# Include avahi-daemon defaults if available.
 test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
 
 DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
 
-if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then
-    log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
-    exit 0
+if [ -n "$AVAHI_DAEMON_START" ]; then
+    log_warning_msg "The AVAHI_DAEMON_START option in /etc/default/$NAME has been deprecated."
+    log_warning_msg "Please remove this setting from the configuration file."
+    log_warning_msg "To disable the service use a runlevel editor like sysv-rc-conf or bum instead."
 fi
 
 #

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=1911&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Wed Dec  5 09:51:34 2007
@@ -1,3 +1,11 @@
+avahi (0.6.21-6) UNRELEASED; urgency=low
+
+  * Deprecate the AVAHI_DAEMON_START option and remove it from
+    /etc/default/avahi-daemon. Print a warning message in the init script if 
+    this option is still used. 
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 04 Dec 2007 19:00:37 +0100
+
 avahi (0.6.21-5) experimental; urgency=low
 
   * Add a -dbg package; thanks Sam Morris; closes: #379953.