[maemo-commits] [maemo-commits] r12346 - in projects/connectivity/osso-gwconnect/trunk: . debian

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-06-19 10:54:07 +0300 (Tue, 19 Jun 2007)
New Revision: 12346

Modified:
   projects/connectivity/osso-gwconnect/trunk/configure.ac
   projects/connectivity/osso-gwconnect/trunk/debian/btcond.init
   projects/connectivity/osso-gwconnect/trunk/debian/changelog
   projects/connectivity/osso-gwconnect/trunk/debian/rules
Log:
Delay start of btcond. Fixes: NB#60079

Modified: projects/connectivity/osso-gwconnect/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/configure.ac	2007-06-18 16:01:42 UTC (rev 12345)
+++ projects/connectivity/osso-gwconnect/trunk/configure.ac	2007-06-19 07:54:07 UTC (rev 12346)
@@ -1,4 +1,4 @@
-AC_INIT([osso-gwconnect],[1.0.10])
+AC_INIT([osso-gwconnect],[1.0.11])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-gwconnect/trunk/debian/btcond.init
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/debian/btcond.init	2007-06-18 16:01:42 UTC (rev 12345)
+++ projects/connectivity/osso-gwconnect/trunk/debian/btcond.init	2007-06-19 07:54:07 UTC (rev 12346)
@@ -23,14 +23,16 @@
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	if [ "$USE_DSMETOOL" = "yes" ]; then
-		dsmetool -n -1 $USER_FLAGS -r "$DAEMON -l $DAEMON_OPTS"
-	else
-		start-stop-daemon --start --quiet $USER_FLAGS \
-			--exec $DAEMON -- -d $DAEMON_OPTS
+	if [ ! -e /tmp/first-boot-flag-tmp ]; then
+	    echo -n "Starting $DESC: "
+	    if [ "$USE_DSMETOOL" = "yes" ]; then
+		    dsmetool -n -1 $USER_FLAGS -r "$DAEMON -l $DAEMON_OPTS"
+	    else
+		    start-stop-daemon --start --quiet $USER_FLAGS \
+			    --exec $DAEMON -- -d $DAEMON_OPTS
+	    fi
+	    echo "$NAME."
 	fi
-	echo "$NAME."
 	;;
   stop)
 	echo -n "Stopping $DESC: "

Modified: projects/connectivity/osso-gwconnect/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/debian/changelog	2007-06-18 16:01:42 UTC (rev 12345)
+++ projects/connectivity/osso-gwconnect/trunk/debian/changelog	2007-06-19 07:54:07 UTC (rev 12346)
@@ -1,3 +1,9 @@
+osso-gwconnect (1.0.11) unstable; urgency=low
+
+  * Delay start of btcond. Fixes: NB#60079 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 19 Jun 2007 10:54:17 +0300
+
 osso-gwconnect (1.0.10) unstable; urgency=low
 
   * Add "HSP" (headset role) identifier to btsdp

Modified: projects/connectivity/osso-gwconnect/trunk/debian/rules
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/debian/rules	2007-06-18 16:01:42 UTC (rev 12345)
+++ projects/connectivity/osso-gwconnect/trunk/debian/rules	2007-06-19 07:54:07 UTC (rev 12346)
@@ -73,7 +73,7 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installman -posso-gwconnect debian/btcond.1 debian/btsdp.1 debian/btsearch.1 debian/sdp-query.1
-	dh_installinit --name=btcond -- start 30 2 3 4 . stop 20 0 1 6 . stop 15 5 .
+	dh_installinit --name=btcond -- start 57 2 3 4 . stop 20 0 1 6 . stop 15 5 .
 	dh_link
 	dh_strip
 	dh_compress