[maemo-commits] [maemo-commits] r14334 - in projects/connectivity/osso-bluez-compat/trunk: . debian etc

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-10-05 16:40:28 +0300 (Fri, 05 Oct 2007)
New Revision: 14334

Modified:
   projects/connectivity/osso-bluez-compat/trunk/configure.ac
   projects/connectivity/osso-bluez-compat/trunk/debian/changelog
   projects/connectivity/osso-bluez-compat/trunk/debian/control
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
Log:
Don't enable bluetooth in restore script

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-10-05 13:19:28 UTC (rev 14333)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-10-05 13:40:28 UTC (rev 14334)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.13])
+AC_INIT([osso-bluez-compat],[0.14])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-10-05 13:19:28 UTC (rev 14333)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-10-05 13:40:28 UTC (rev 14334)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.14) unstable; urgency=low
+
+  * Don't switch bluetooth on in restore script. Fixes: NB#72216 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Fri,  5 Oct 2007 12:52:27 +0000
+
 osso-bluez-compat (0.13) unstable; urgency=low
 
   * Read the backed up mode value correctlye. Fixes: NB#67991 

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/control
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/control	2007-10-05 13:19:28 UTC (rev 14333)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/control	2007-10-05 13:40:28 UTC (rev 14334)
@@ -8,7 +8,7 @@
 Package: osso-bluez-compat
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, bluez-utils
+Depends: ${shlibs:Depends}, bluez-utils (>= 3.20)
 Description: OSSO compatibility tools for BlueZ
  This package contais a some programs and scripts which help
  integrate BlueZ to the OSSO environment.

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-10-05 13:19:28 UTC (rev 14333)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-10-05 13:40:28 UTC (rev 14334)
@@ -28,10 +28,6 @@
 
 BK_MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
 
-OLD_MODE=`dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.GetMode|tail -n 1|awk '{ print $2 }'|sed s/\"//g`
-
-dbus-send --system --print-reply --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
-
 NAME=""
 
 if [ "$1" ] && [ "`grep /etc/bluetooth/name $1`" ] && [ ! -f "$CORRECT_DIR/config" ]; then
@@ -46,15 +42,7 @@
 	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME" > /dev/null
 fi
 
-MODE=""
-
 if [ "$BK_MODE" ]; then
-	MODE=$BK_MODE
-elif [ "$OLD_MODE" ]; then
-	MODE=$OLD_MODE
-else
-	MODE="off"
+	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$BK_MODE > /dev/null
 fi
 
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
-