[maemo-commits] [maemo-commits] r17918 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-04-01 11:22:11 +0300 (Wed, 01 Apr 2009)
New Revision: 17918

Modified:
   projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
Log:
Start/stop hildon-home from af-sb-init.sh, if present

Modified: projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
===================================================================
--- projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2009-04-01 08:18:51 UTC (rev 17917)
+++ projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2009-04-01 08:22:11 UTC (rev 17918)
@@ -163,6 +163,11 @@
   # just in case something goes to the script in the future
   af_sb_init_service lessertunjo0 stop
 
+  HILDON_HOME_PID=$(pidof hildon-home)
+  if test "x$HILDON_HOME_PID" != "x"; then
+    kill $HILDON_HOME_PID
+  fi
+
   # remove dbus own dbus pid file
   rm -rf /var/run/dbus/pid
 fi
@@ -234,6 +239,11 @@
   # start hildon-desktop
   af_sb_init_service hildon-desktop start
 
+  # start hildon-home
+  if test -x /usr/bin/hildon-home; then
+    /usr/bin/hildon-home &
+  fi
+
   # start HIM
   af_sb_service keyboard start
 fi

Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2009-04-01 08:18:51 UTC (rev 17917)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2009-04-01 08:22:11 UTC (rev 17918)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [1.22])
+AC_INIT([hildon-initscripts], [1.23])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 
 AM_INIT_AUTOMAKE

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2009-04-01 08:18:51 UTC (rev 17917)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2009-04-01 08:22:11 UTC (rev 17918)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.23-1) unstable; urgency=low
+
+  * Start/stop hildon-home from af-sb-init.sh, if present
+  * Fixes: NB#108827 (hildon-home should be started by af-sb-init.sh script)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  1 Apr 2009 11:16:24 +0300
+
 hildon-initscripts (1.22-1) unstable; urgency=low
 
   * Don't touch $HOME in postinst. Instead, distribute /etc/skel/.osso/