[Pkg-maemo-commits] r80 ./osso-gwconnect/debian: * Merge with trunk branch.

[Jonny Lamb]

------------------------------------------------------------
revno: 80
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: osso-gwconnect
timestamp: Mon 2007-07-23 15:49:11 +0100
message:
  * Merge with trunk branch.
modified:
  configure.ac
  debian/btcond.init
  debian/changelog
    ------------------------------------------------------------
    revno: 47.1.1
    merged: vcs-imports at canonical.com-20070619075407-i1undykj4sczl15z
    committer: jh
    timestamp: Tue 2007-06-19 07:54:07 +0000
    message:
      Delay start of btcond. Fixes: NB#60079
-------------- next part --------------
=== modified file 'configure.ac'
--- a/configure.ac	2007-04-10 08:04:38 +0000
+++ b/configure.ac	2007-06-19 07:54:07 +0000
@@ -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 file 'debian/btcond.init'
--- a/debian/btcond.init	2006-03-31 09:06:35 +0000
+++ b/debian/btcond.init	2007-06-19 07:54:07 +0000
@@ -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 file 'debian/changelog'
--- a/debian/changelog	2007-07-23 14:34:07 +0000
+++ b/debian/changelog	2007-07-23 14:49:11 +0000
@@ -1,4 +1,4 @@
-osso-gwconnect (1.0.10.debian-1) UNRELEASED; urgency=low
+osso-gwconnect (1.0.11.debian-1) UNRELEASED; urgency=low
 
   [ Loic Minier ]
   * Set Debian Maemo Maintainers as Maintainer; add myself to Uploaders.
@@ -20,8 +20,15 @@
   [ Jonny Lamb ]
   * Updated descriptions in control.
   * Add myself to Uploaders.
-
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 15:33:36 +0100
+  * Merge with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 15:48:50 +0100
+
+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.10ubuntu3) gutsy; urgency=low