[Pkg-utopia-commits] r368 - packages/experimental/avahi/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-11-21 19:58:55 +0000 (Mon, 21 Nov 2005)
New Revision: 368

Modified:
   packages/experimental/avahi/debian/avahi-daemon.postinst
   packages/experimental/avahi/debian/changelog
   packages/experimental/avahi/debian/control
Log:
Depend on new dbus so we can force-reload it instead of using dbus-send ourselves

Modified: packages/experimental/avahi/debian/avahi-daemon.postinst
===================================================================
--- packages/experimental/avahi/debian/avahi-daemon.postinst	2005-11-21 10:19:25 UTC (rev 367)
+++ packages/experimental/avahi/debian/avahi-daemon.postinst	2005-11-21 19:58:55 UTC (rev 368)
@@ -26,9 +26,10 @@
     fi
 
     # Ask the bus to reload the config file
-    dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig || true
-    # Restart the daemon
-    sleep 1 && /etc/init.d/avahi-daemon restart
+    if [ -x "/etc/init.d/dbus" ]; then
+      invoke-rc.d dbus force-reload || true
+    fi
+    /etc/init.d/avahi-daemon restart
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

Modified: packages/experimental/avahi/debian/changelog
===================================================================
--- packages/experimental/avahi/debian/changelog	2005-11-21 10:19:25 UTC (rev 367)
+++ packages/experimental/avahi/debian/changelog	2005-11-21 19:58:55 UTC (rev 368)
@@ -1,8 +1,10 @@
 avahi (0.5.2-5) experimental; urgency=low
 
-  * Depend on dbus >= 0.50-2 instead of dbus-1-utils for dbus-send.
+  [ Sjoerd Simons ]
+  * Depend on dbus >= 0.50-3 so we can use force-reload to have dbus reload
+    configuration. 
 
- --
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 21 Nov 2005 20:57:18 +0100
 
 avahi (0.5.2-4) experimental; urgency=low
 

Modified: packages/experimental/avahi/debian/control
===================================================================
--- packages/experimental/avahi/debian/control	2005-11-21 10:19:25 UTC (rev 367)
+++ packages/experimental/avahi/debian/control	2005-11-21 19:58:55 UTC (rev 368)
@@ -8,7 +8,7 @@
 Package: avahi-daemon
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus (>= 0.50-2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus (>= 0.50-3)
 Recommends: dbus, libnss-mdns
 Suggests: avahi-dnsconfd
 Conflicts: mdnsresponder