[Pkg-utopia-commits] r343 - packages/experimental/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-10-28 14:08:35 +0000 (Fri, 28 Oct 2005)
New Revision: 343

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/control
   packages/experimental/hal/debian/hal.postinst
   packages/experimental/hal/debian/hal.postrm
Log:
Only reload dbus, never restart it

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-10-28 13:49:19 UTC (rev 342)
+++ packages/experimental/hal/debian/changelog	2005-10-28 14:08:35 UTC (rev 343)
@@ -1,12 +1,13 @@
 hal (0.5.4-3) experimental; urgency=low
 
-  * Sync with ubuntu (Thanks Martin Pitt) 
+  * Sync with ubuntu (Thanks Martin Pitt)
     + Make libhal-storage-dev depend libhal-dev
     + Fix rm_conffile in hal.preinst
     + Install hal-find-by-capability and hal-find-by-property
-    + Translation updates for hal-device-manager.desktop 
+    + Translation updates for hal-device-manager.desktop
+  * Never restart dbus in postinst or postrm . Only reload it's config.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 28 Oct 2005 14:29:35 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 28 Oct 2005 16:06:38 +0200
 
 hal (0.5.4-2) experimental; urgency=low
 

Modified: packages/experimental/hal/debian/control
===================================================================
--- packages/experimental/hal/debian/control	2005-10-28 13:49:19 UTC (rev 342)
+++ packages/experimental/hal/debian/control	2005-10-28 14:08:35 UTC (rev 343)
@@ -7,7 +7,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.063), dbus, lsb-base
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.063), dbus (>= 0.50-2), lsb-base
 Suggests: hal-device-manager
 Description: Hardware Abstraction Layer
  HAL provides an abstract view on hardware.

Modified: packages/experimental/hal/debian/hal.postinst
===================================================================
--- packages/experimental/hal/debian/hal.postinst	2005-10-28 13:49:19 UTC (rev 342)
+++ packages/experimental/hal/debian/hal.postinst	2005-10-28 14:08:35 UTC (rev 343)
@@ -43,7 +43,8 @@
     # only start dbus/hal if it is not already running
     if [ ! -e /var/run/hal/hald.pid ] || ! ps --no-headers -p $(< /var/run/hal/hald.pid) > /dev/null ; then
         if [ -x /etc/init.d/dbus ]; then
-            invoke-rc.d dbus restart || true
+            invoke-rc.d dbus reload || true
+            /etc/dbus-1/even.d/20hal start || true
         fi
     fi
 

Modified: packages/experimental/hal/debian/hal.postrm
===================================================================
--- packages/experimental/hal/debian/hal.postrm	2005-10-28 13:49:19 UTC (rev 342)
+++ packages/experimental/hal/debian/hal.postrm	2005-10-28 14:08:35 UTC (rev 343)
@@ -3,10 +3,8 @@
 set -e
 
 # Do not restart dbus on upgrades, only if we remove the package.
-if [ "$1" = "remove" ]; then
-    if [ -x /etc/init.d/dbus ]; then
-        invoke-rc.d dbus restart || true
-    fi
+if [ -x /etc/init.d/dbus ]; then
+  invoke-rc.d dbus reload || true
 fi
 
 #DEBHELPER#