[maemo-commits] [maemo-commits] r16686 - projects/connectivity/bluez-utils-debian/branches/diablo

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-11-17 11:21:54 +0200 (Mon, 17 Nov 2008)
New Revision: 16686

Modified:
   projects/connectivity/bluez-utils-debian/branches/diablo/bluez-utils.init
   projects/connectivity/bluez-utils-debian/branches/diablo/changelog
Log:
Update with latest diablo version

Modified: projects/connectivity/bluez-utils-debian/branches/diablo/bluez-utils.init
===================================================================
--- projects/connectivity/bluez-utils-debian/branches/diablo/bluez-utils.init	2008-11-17 09:20:21 UTC (rev 16685)
+++ projects/connectivity/bluez-utils-debian/branches/diablo/bluez-utils.init	2008-11-17 09:21:54 UTC (rev 16686)
@@ -1,7 +1,6 @@
 #! /bin/sh
+# # bluez-utils    Bluetooth subsystem starting and stopping
 #
-# bluez-utils    Bluetooth subsystem starting and stopping
-#
 # startup control over dund and pand can be changed by
 # editing /etc/default/bluez-utils
 
@@ -29,15 +28,7 @@
 		fi
 
 		if [ "$HW" = "RX-48" ]; then
-			if [ -f "/etc/bluetooth/audio.service" ]; then
-				AUDIO_PATH=`(dbus-send --system --dest=org.bluez --print-reply /org/bluez org.bluez.Manager.FindService string:audio 2> /dev/null || true) |tail -n 1|awk '{ print $2; }'|sed -e 's/"//g'`
-
-				if [ "$AUDIO_PATH" ]; then
-					sed -i -e 's/^Autostart=true/Autostart=false/' /etc/bluetooth/audio.service
-					dbus-send --dest=org.bluez --print-reply --system --print-reply $AUDIO_PATH org.bluez.Service.Stop > /dev/null || true
-				fi
-			fi
-
+			rm -f /etc/bluetooth/audio.service
 			dbus-send --dest=org.bluez --print-reply --system /org/bluez/hci0 org.bluez.Adapter.SetMode string:off > /dev/null || true
 		fi
 	else

Modified: projects/connectivity/bluez-utils-debian/branches/diablo/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/branches/diablo/changelog	2008-11-17 09:20:21 UTC (rev 16685)
+++ projects/connectivity/bluez-utils-debian/branches/diablo/changelog	2008-11-17 09:21:54 UTC (rev 16686)
@@ -1,5 +1,23 @@
-bluez-utils (3.28-0osso4) hardy; urgency=low
+bluez-utils (3.28-0osso7) unstable; urgency=low
 
+  * Fix mistakenly removed SetMode("off") call in init script. Fixes: NB#91182
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 03 Nov 2008 12:48:21 +0200
+
+bluez-utils (3.28-0osso6) unstable; urgency=low
+
+  * Remove audio.service on RX-48. Fixes: NB#89674
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 13 Oct 2008 11:11:58 +0000
+
+bluez-utils (3.28-0osso5) unstable; urgency=low
+
+  * Fix init script logic on RX-48.
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 11 Aug 2008 11:25:03 +0000
+
+bluez-utils (3.28-0osso4) unstable; urgency=low
+
   * Fix disconnection tracking bug caused by the previous fix. Fixes: NB#84673
 
  -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 22 Apr 2008 15:24:11 +0300