[maemo-commits] [maemo-commits] r15125 - in projects/connectivity/bluez-utils-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-02-03 23:55:06 +0200 (Sun, 03 Feb 2008)
New Revision: 15125

Modified:
   projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init
   projects/connectivity/bluez-utils-debian/trunk/changelog
   projects/connectivity/bluez-utils-debian/trunk/control
   projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch
Log:
Prepare for bluez-utils-3.25

Modified: projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init	2008-02-03 21:52:40 UTC (rev 15124)
+++ projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init	2008-02-03 21:55:06 UTC (rev 15125)
@@ -2,7 +2,7 @@
 #
 # bluez-utils    Bluetooth subsystem starting and stopping
 #
-# startup control over dund and pand can be changed by 
+# startup control over dund and pand can be changed by
 # editing /etc/default/bluez-utils
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -21,7 +21,18 @@
 
 case "$1" in
   start)
-	if [ ! -e /tmp/first-boot-flag-tmp ]; then
+	if [ -e /tmp/first-boot-flag-tmp ]; then
+		if [ -f "/etc/bluetooth/audio.service" ] && [ -x "/usr/bin/osso-product-info" ]; then
+			HW=`osso-product-info -qOSSO_PRODUCT_HARDWARE`
+			AUDIO_PATH=`dbus-send --system --dest=org.bluez --print-reply /org/bluez org.bluez.Manager.FindService string:audio 2> /dev/null|tail -n 1|awk '{ print $2; }'|sed -e 's/"//g'`
+
+			# Disable automatic audio service startup on RX-48 HW
+			if [ "$AUDIO_PATH" ] && [ "$HW" = "RX-48" ]; then
+				sed -i -e 's/^Autostart=true/Autostart=false/' /etc/bluetooth/audio.service
+				dbus-send --dest=org.bluez --system --print-reply $AUDIO_PATH org.bluez.Service.Stop 2> /dev/null
+			fi
+		fi
+	else
 	    echo -n "Starting $DESC:"
 	    if [ "$USE_DSMETOOL" = "yes" ]; then
 		    dsmetool -n -1 -t "$HCID -n $HCID_OPTIONS" || true

Modified: projects/connectivity/bluez-utils-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/changelog	2008-02-03 21:52:40 UTC (rev 15124)
+++ projects/connectivity/bluez-utils-debian/trunk/changelog	2008-02-03 21:55:06 UTC (rev 15125)
@@ -1,3 +1,23 @@
+bluez-utils (3.25-0osso1) unstable; urgency=low
+
+  * New upstream version
+  * Disable automatic audio service startup on RX-48 HW
+  * Changes from upstream ChangeLog:
+     - Add limited support for Handsfree profile.
+     - Add limited support for MPEG12/MP3 codec.
+     - Add basic support for UNITINFO and SUBUNITINFO.
+     - Add more SBC optimizations.
+     - Fix external service (un)registration.
+     - Allow GetInfo and GetAddress to fail.
+     - Add TCP connection support for serial proxy.
+     - Add fix for Logitech HID proxy switching.
+     - Add missing macros, MIN, MAX, ABS and CLAMP.
+     - Add initial mechanism to handle headset commands.
+     - Fix connecting to handsfree profile headsets.
+     - Use proper function for checking signal name.
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Sun,  3 Feb 2008 21:27:54 +0000
+
 bluez-utils (3.23-0osso1) unstable; urgency=low
 
   * New upstream release.

Modified: projects/connectivity/bluez-utils-debian/trunk/control
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/control	2008-02-03 21:52:40 UTC (rev 15124)
+++ projects/connectivity/bluez-utils-debian/trunk/control	2008-02-03 21:55:06 UTC (rev 15125)
@@ -2,13 +2,13 @@
 Section: admin
 Priority: optional
 Maintainer: Johan Hedberg <johan.hedberg at nokia.com>
-Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.23), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libhal-dev, libasound2-dev, libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.6.1
+Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.25), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libhal-dev, libasound2-dev, libgstreamer-plugins-base0.10-dev
+Standards-Version: 3.7.2
 
 Package: bluez-utils
 Architecture: any
 Depends: ${shlibs:Depends}, module-init-tools, dbus
-Recommends: dsme
+Recommends: dsme, osso-product-info
 Description: Bluetooth tools and daemons
  This package contains tools and system daemons for using Bluetooth devices.
  .

Modified: projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch	2008-02-03 21:52:40 UTC (rev 15124)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/004_audio_conf.patch	2008-02-03 21:55:06 UTC (rev 15125)
@@ -1,11 +1,11 @@
---- audio/audio.conf	2007-08-28 18:59:36.000000000 +0300
-+++ audio/audio.conf	2007-08-30 17:57:40.000000000 +0300
+--- audio/audio.conf	2008-02-01 23:16:30.000000000 +0000
++++ audio/audio.conf	2008-02-03 21:37:09.000000000 +0000
 @@ -6,11 +6,11 @@
  
  # If we want to disable support for specific services
  # Defaults to supporting all implemented services
 -#Disable=Control,Source
-+Disable=Sink
++Disable=Control,Sink
  
  # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
  # Defaults to HCI