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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-04-11 15:43:59 +0300 (Fri, 11 Apr 2008)
New Revision: 15384

Modified:
   projects/haf/trunk/hildon-initscripts/ChangeLog
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/scratchbox-launcher.sh
Log:
  * Do not kill -9 a process inside scratchbox-launcher.sh. Do a plain kill instead.
  * Partially fixes NB#80032 (works only on x86)


Modified: projects/haf/trunk/hildon-initscripts/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-initscripts/ChangeLog	2008-04-10 13:55:16 UTC (rev 15383)
+++ projects/haf/trunk/hildon-initscripts/ChangeLog	2008-04-11 12:43:59 UTC (rev 15384)
@@ -1,3 +1,8 @@
+2008-04-11  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Do not kill -9 a process inside scratchbox-launcher.sh. Do a plain kill instead.
+	* Partially fixes NB#80032 (works only on x86)
+
 2008-01-17  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Improved GTK+ theme validity check

Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2008-04-10 13:55:16 UTC (rev 15383)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2008-04-11 12:43:59 UTC (rev 15384)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [1.14])
+AC_INIT([hildon-initscripts], [1.15])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2008-04-10 13:55:16 UTC (rev 15383)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2008-04-11 12:43:59 UTC (rev 15384)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.15-1) unstable; urgency=low
+
+  * Do not kill -9 a process inside scratchbox-launcher.sh. Do a plain kill instead.
+  * Partially fixes NB#80032 (works only on x86)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Fri, 11 Apr 2008 15:08:19 +0300
+
 hildon-initscripts (1.14-1) unstable; urgency=low
 
   * Improved GTK+ theme validity check

Modified: projects/haf/trunk/hildon-initscripts/scratchbox-launcher.sh
===================================================================
--- projects/haf/trunk/hildon-initscripts/scratchbox-launcher.sh	2008-04-10 13:55:16 UTC (rev 15383)
+++ projects/haf/trunk/hildon-initscripts/scratchbox-launcher.sh	2008-04-11 12:43:59 UTC (rev 15384)
@@ -60,7 +60,7 @@
         PID=`cat $PIDFILE`
         grep "$BASENAME" /proc/$PID/cmdline >/dev/null 2>&1
         if [ $? -eq 0 ]; then       
-            kill -9 $PID
+            kill $PID
         else
             echo "$SVC is not running"
         fi