[Pkg-utopia-commits] r875 - in packages/unstable/avahi/debian: . default patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-06-27 23:19:08 +0000 (Tue, 27 Jun 2006)
New Revision: 875

Added:
   packages/unstable/avahi/debian/default/
   packages/unstable/avahi/debian/default/avahi-daemon
   packages/unstable/avahi/debian/default/avahi-dnsconfd
   packages/unstable/avahi/debian/patches/09_initscripts-default.patch
Modified:
   packages/unstable/avahi/debian/avahi-daemon.install
   packages/unstable/avahi/debian/avahi-dnsconfd.install
   packages/unstable/avahi/debian/changelog
Log:
* added /etc/default files for the two avahi-daemons


Modified: packages/unstable/avahi/debian/avahi-daemon.install
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.install	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/avahi-daemon.install	2006-06-27 23:19:08 UTC (rev 875)
@@ -5,3 +5,4 @@
 debian/tmp/usr/sbin/avahi-daemon
 debian/tmp/usr/share/avahi/avahi-service.dtd
 debian/tmp/usr/share/avahi/introspection/
+debian/default/avahi-daemon /etc/default

Modified: packages/unstable/avahi/debian/avahi-dnsconfd.install
===================================================================
--- packages/unstable/avahi/debian/avahi-dnsconfd.install	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/avahi-dnsconfd.install	2006-06-27 23:19:08 UTC (rev 875)
@@ -1,3 +1,4 @@
 debian/tmp/etc/avahi/avahi-dnsconfd.action
 debian/tmp/etc/init.d/avahi-dnsconfd
 debian/tmp/usr/sbin/avahi-dnsconfd
+debian/default/avahi-dnsconfd /etc/default

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/changelog	2006-06-27 23:19:08 UTC (rev 875)
@@ -6,6 +6,9 @@
 
   [ Sebastian Dröge ]
   * New upstream release
+  * debian/patches/09_initscripts-default.patch:
+    Add /etc/default/avahi-daemon and /etc/default/avahi-dnsconfd to allow
+    disabling of the startup of both daemons (Closes: #349603)
 
  -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 26 Jun 2006 09:56:01 +0200
 

Added: packages/unstable/avahi/debian/default/avahi-daemon
===================================================================
--- packages/unstable/avahi/debian/default/avahi-daemon	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/default/avahi-daemon	2006-06-27 23:19:08 UTC (rev 875)
@@ -0,0 +1,2 @@
+# 0 = don't start, 1 = start
+AVAHI_DAEMON_START=1

Added: packages/unstable/avahi/debian/default/avahi-dnsconfd
===================================================================
--- packages/unstable/avahi/debian/default/avahi-dnsconfd	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/default/avahi-dnsconfd	2006-06-27 23:19:08 UTC (rev 875)
@@ -0,0 +1,2 @@
+# 0 = don't start, 1 = start
+AVAHI_DNSCONFD_START=1

Added: packages/unstable/avahi/debian/patches/09_initscripts-default.patch
===================================================================
--- packages/unstable/avahi/debian/patches/09_initscripts-default.patch	2006-06-27 17:03:49 UTC (rev 874)
+++ packages/unstable/avahi/debian/patches/09_initscripts-default.patch	2006-06-27 23:19:08 UTC (rev 875)
@@ -0,0 +1,34 @@
+--- initscript/debian/avahi-daemon.in.old	2006-06-28 00:49:27.989393500 +0200
++++ initscript/debian/avahi-daemon.in	2006-06-28 01:11:54.653554750 +0200
+@@ -87,6 +87,14 @@
+ # Gracefully exit if the package has been removed.
+ test -x $DAEMON || exit 0
+ 
++# don't start if /etc/avahi-daemon says so.
++AVAHI_DAEMON_START=1
++test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
++
++if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then
++	exit 0
++fi
++
+ #
+ #       Function that starts the daemon/service.
+ #
+--- initscript/debian/avahi-dnsconfd.in.old	2006-06-28 01:10:09.702995750 +0200
++++ initscript/debian/avahi-dnsconfd.in	2006-06-28 01:11:30.364036750 +0200
+@@ -87,6 +87,14 @@
+ # Gracefully exit if the package has been removed.
+ test -x $DAEMON || exit 0
+ 
++# don't start if /etc/default/avahi-dnsconfd says so. 
++AVAHI_DNSCONFD_START=1
++test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
++
++if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
++    exit 0
++fi
++
+ #
+ #       Function that starts the daemon/service.
+ #