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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar 29 22:00:29 2009
New Revision: 3013

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3013
Log:
* debian/avahi-daemon.init
  - Check for DISABLE_TAG *and* AVAHI_DAEMON_DETECT_LOCAL != 0 before
    disabling the avahi-daemon service. (Closes: #517211)
    Thanks to Reed Hedges for the fix.
  - Remove some old cruft.

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

Modified: packages/unstable/avahi/debian/avahi-daemon.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.init?rev=3013&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.init (original)
+++ packages/unstable/avahi/debian/avahi-daemon.init Sun Mar 29 22:00:29 2009
@@ -30,12 +30,6 @@
 
 DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
 
-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
-
 #
 #       Function that starts the daemon/service.
 #
@@ -44,7 +38,7 @@
 
     $DAEMON -c && return 0
 
-    if [ -e ${DISABLE_TAG} ]; then 
+    if [ -e $DISABLE_TAG -a "$AVAHI_DAEMON_DETECT_LOCAL" != "0" ]; then 
       # Disabled because of the existance of an unicast .local domain
       log_warning_msg "avahi-daemon disabled because there is a unicast .local domain"
       exit 0;

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3013&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Sun Mar 29 22:00:29 2009
@@ -15,6 +15,11 @@
   * debian/python-avahi.examples
     - Install avahi-bookmarks as example in
       /usr/share/doc/python-avahi/examples/. (Closes: #368566)
+  * debian/avahi-daemon.init
+    - Check for DISABLE_TAG *and* AVAHI_DAEMON_DETECT_LOCAL != 0 before
+      disabling the avahi-daemon service. (Closes: #517211)
+      Thanks to Reed Hedges for the fix.
+    - Remove some old cruft.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 29 Mar 2009 21:52:23 +0200