[Pkg-utopia-commits] r35 - packages/hal/trunk/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2004-10-19 05:33:16 -0600 (Tue, 19 Oct 2004)
New Revision: 35

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal.preinst
Log:
hal.preinst updated:
 * Stop hal in preinst instead of dbus
 * Add missing debhelper token
 * Remove fstab-update.sh transition.



Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-10-19 11:25:34 UTC (rev 34)
+++ packages/hal/trunk/debian/changelog	2004-10-19 11:33:16 UTC (rev 35)
@@ -20,6 +20,9 @@
        - haldb-require-privs.patch
        - libgphoto2-usermap.patch
        - netlink_spoofing.patch
+     + debian/hal.preinst: Stop hal in preinst instead of dbus
+     + debian/hal.preinst: Add missing debhelper token
+     + debian/hal.preinst: Remove fstab-update.h transition.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 18 Oct 2004 16:30:01 +0200
 

Modified: packages/hal/trunk/debian/hal.preinst
===================================================================
--- packages/hal/trunk/debian/hal.preinst	2004-10-19 11:25:34 UTC (rev 34)
+++ packages/hal/trunk/debian/hal.preinst	2004-10-19 11:33:16 UTC (rev 35)
@@ -1,13 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 
 set -e
 
-if [ "$1" = "upgrade" -a -e /etc/hal/device.d/fstab-update.sh ]; then
-  mv -f /etc/hal/device.d/fstab-update.sh \
-    /etc/hal/device.d/fstab-update.hal || true
+if [ "$1" = "upgrade" ]; then
+  start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/hald
 fi
-if [ "$1" = "install" -o "$1" = "upgrade" ]; then
-  invoke-rc.d dbus-1 stop
-  # sometimes it takes dbus a while to really stop.
-  sleep 3;
-fi
+
+#DEBHELPER#