[maemo-commits] [maemo-commits] r18842 - projects/haf/trunk/ke-recv/debian

[From: subversion at stage.maemo.org]

Author: akojo
Date: 2009-07-07 16:09:55 +0300 (Tue, 07 Jul 2009)
New Revision: 18842

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/debian/init.d
   projects/haf/trunk/ke-recv/debian/ke-recv.upstart
Log:
Applied Peter Aradi's patch for NB#125773.

Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-07-07 09:06:40 UTC (rev 18841)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-07-07 13:09:55 UTC (rev 18842)
@@ -1,6 +1,7 @@
 ke-recv (3.21-1~unreleased) unstable; urgency=low
 
-  * foo
+  Peter Aradi:
+  * Fixes: NB#125773: ke-recv should provide g_* handling
 
  -- Aapo Kojo <aapo.kojo at nokia.com>  Tue, 30 Jun 2009 14:35:09 +0300
 

Modified: projects/haf/trunk/ke-recv/debian/init.d
===================================================================
--- projects/haf/trunk/ke-recv/debian/init.d	2009-07-07 09:06:40 UTC (rev 18841)
+++ projects/haf/trunk/ke-recv/debian/init.d	2009-07-07 13:09:55 UTC (rev 18842)
@@ -76,12 +76,13 @@
                 fi
         fi
 
-	if [ -x $DTOOL ]; then
-        	$DTOOL -U $USER -n -1 -t $DAEMON
-	else
+# NOTE: ke-recv is now started earlier
+#	if [ -x $DTOOL ]; then
+#        	$DTOOL -U $USER -n -1 -t $DAEMON
+#	else
 		start-stop-daemon -b --start --quiet --user $USER \
 			--exec $DAEMON -- $PARAMS
-	fi
+#	fi
 	echo "$NAME."
 	;;
   stop)

Modified: projects/haf/trunk/ke-recv/debian/ke-recv.upstart
===================================================================
--- projects/haf/trunk/ke-recv/debian/ke-recv.upstart	2009-07-07 09:06:40 UTC (rev 18841)
+++ projects/haf/trunk/ke-recv/debian/ke-recv.upstart	2009-07-07 13:09:55 UTC (rev 18842)
@@ -1,7 +1,7 @@
 description "starting ke-recv"
 author "Philippe De Swert"
-start on started hildon-desktop
-stop on ACT_DEAD
+start on startup
+stop on starting shutdown
 console none
 script
         export RUNLEVEL=2