[maemo-commits] [maemo-commits] r9750 - projects/haf/trunk/dbus/debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-02-08 16:43:55 +0200 (Thu, 08 Feb 2007)
New Revision: 9750

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/dbus.init
Log:
activated running of /etc/dbus-1/event.d scripts


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-02-08 13:36:49 UTC (rev 9749)
+++ projects/haf/trunk/dbus/debian/changelog	2007-02-08 14:43:55 UTC (rev 9750)
@@ -1,3 +1,10 @@
+dbus (1.0.2-0osso2) experimental; urgency=low
+
+  * UNRELEASED
+  * Activated /etc/dbus-1/event.d for HAL.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 08 Feb 2007 16:44:34 +0200
+
 dbus (1.0.2-0osso1) experimental; urgency=low
 
   * Upgraded the upstream tarball to v1.0.2.

Modified: projects/haf/trunk/dbus/debian/dbus.init
===================================================================
--- projects/haf/trunk/dbus/debian/dbus.init	2007-02-08 13:36:49 UTC (rev 9749)
+++ projects/haf/trunk/dbus/debian/dbus.init	2007-02-08 14:43:55 UTC (rev 9750)
@@ -55,9 +55,6 @@
   start-stop-daemon --start --quiet --pidfile $PIDFILE \
     --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS --fork
   echo "$NAME."
-#  if [ -d $EVENTDIR ]; then
-#      run-parts --arg=start $EVENTDIR
-#  fi
  else
   # start with dsmetool
   rm -f $PIDFILE
@@ -65,14 +62,17 @@
   /usr/sbin/dsmetool -r "$DAEMON --system $PARAMS" -n -5
   echo "$NAME."
  fi
+ if [ -d $EVENTDIR ]; then
+     run-parts --arg=start $EVENTDIR
+ fi
 }
 
 shut_it_down()
 {
+ if [ -d $EVENTDIR ]; then
+     run-parts --reverse --arg=stop $EVENTDIR
+ fi
  if [ "x$USE_DT" = "x" ]; then
-#  if [ -d $EVENTDIR ]; then
-#      run-parts --reverse --arg=stop $EVENTDIR
-#  fi
   echo -n "Stopping $DESC: "
   start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \
     --user $DAEMONUSER