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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-15 20:29:53 +0000 (Wed, 15 Feb 2006)
New Revision: 589

Added:
   packages/unstable/avahi/debian/patches/02_avahi-initscripts.patch
Removed:
   packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
More fixes for the init scripts

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-02-15 19:38:17 UTC (rev 588)
+++ packages/unstable/avahi/debian/changelog	2006-02-15 20:29:53 UTC (rev 589)
@@ -1,9 +1,10 @@
 avahi (0.6.7-1) unstable; urgency=low
 
   * New upstream release
-  * debian/patches/02_avahi-init_capabilities.patch
-    + Added. For loading of the capabilities kernel module before starting the
-    daemon. (Closes: #352858)
+  * debian/patches/02_avahi-initscripts.patch
+    + Force the load of the capabilities kernel module before starting the
+      avahi-daemon. (Closes: #352858)
+    + Fix the restart argument of the initscripts
 
  -- Sjoerd Simons <sjoerd at debian.org>  Wed, 15 Feb 2006 20:37:07 +0100
 

Deleted: packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch	2006-02-15 19:38:17 UTC (rev 588)
+++ packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch	2006-02-15 20:29:53 UTC (rev 589)
@@ -1,13 +0,0 @@
-Index: initscript/debian/avahi-daemon.in
-===================================================================
---- initscript/debian/avahi-daemon.in	(revision 1143)
-+++ initscript/debian/avahi-daemon.in	(working copy)
-@@ -91,6 +91,8 @@
- #       Function that starts the daemon/service.
- #
- d_start() {
-+    modprobe capability >/dev/null 2>&1 || true
-+
-     $DAEMON -c
-     [ $? = 0 ] && exit 0
- 

Copied: packages/unstable/avahi/debian/patches/02_avahi-initscripts.patch (from rev 588, packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch)
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-init_capabilities.patch	2006-02-15 19:38:17 UTC (rev 588)
+++ packages/unstable/avahi/debian/patches/02_avahi-initscripts.patch	2006-02-15 20:29:53 UTC (rev 589)
@@ -0,0 +1,35 @@
+Index: initscript/debian/avahi-dnsconfd.in
+===================================================================
+--- initscript/debian/avahi-dnsconfd.in	(revision 1143)
++++ initscript/debian/avahi-dnsconfd.in	(working copy)
+@@ -150,7 +150,7 @@
+         ;;
+     reload|restart|force-reload)
+         log_begin_msg "Restarting $DESC: $NAME"
+-        d_stop
++        $DAEMON -c && d_stop
+         d_start
+         log_end_msg $?
+         ;;
+Index: initscript/debian/avahi-daemon.in
+===================================================================
+--- initscript/debian/avahi-daemon.in	(revision 1143)
++++ initscript/debian/avahi-daemon.in	(working copy)
+@@ -91,6 +91,8 @@
+ #       Function that starts the daemon/service.
+ #
+ d_start() {
++    modprobe capability >/dev/null 2>&1 || true
++
+     $DAEMON -c
+     [ $? = 0 ] && exit 0
+ 
+@@ -150,7 +152,7 @@
+         ;;
+     restart|force-reload)
+         log_begin_msg "Restarting $DESC: $NAME"
+-        d_stop
++        $DAEMON -c && d_stop
+         d_start
+         log_end_msg $?
+         ;;