[maemo-commits] [maemo-commits] r15677 - projects/connectivity/bluez-utils-debian/trunk

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-06-24 12:11:54 +0300 (Tue, 24 Jun 2008)
New Revision: 15677

Modified:
   projects/connectivity/bluez-utils-debian/trunk/bluez-utils-test.install
   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/rules
Log:
Prepare for 3.34

Modified: projects/connectivity/bluez-utils-debian/trunk/bluez-utils-test.install
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/bluez-utils-test.install	2008-06-24 08:47:11 UTC (rev 15676)
+++ projects/connectivity/bluez-utils-debian/trunk/bluez-utils-test.install	2008-06-24 09:11:54 UTC (rev 15677)
@@ -1,4 +1,4 @@
-debian/tmp/usr/bin/*test
+debian/tmp/usr/bin/bluez-*
 debian/tmp/usr/sbin/bccmd
 debian/tmp/usr/bin/l2ping
 debian/tmp/usr/bin/ciptool

Modified: projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init	2008-06-24 08:47:11 UTC (rev 15676)
+++ projects/connectivity/bluez-utils-debian/trunk/bluez-utils.init	2008-06-24 09:11:54 UTC (rev 15677)
@@ -10,7 +10,7 @@
 
 HCID=/usr/sbin/hcid
 HCID_NAME=hcid
-HCID_OPTIONS="-x -s"
+HCID_OPTIONS="-x"
 
 test -f /etc/default/bluez-utils && . /etc/default/bluez-utils
 
@@ -32,8 +32,9 @@
 			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'`
 
+				sed -i -e 's/^Autostart=true/Autostart=false/' /etc/bluetooth/audio.service
+
 				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
@@ -66,9 +67,9 @@
   restart|force-reload)
 	echo -n "Restarting $DESC:"
 	if [ "$USE_DSMETOOL" = "yes" ]; then
-		dsmetool -k "$HCID -n -x -s" || true
+		dsmetool -k "$HCID -n $HCID_OPTIONS" || true
 		sleep 1
-		dsmetool -n -1 -t "$HCID -n -x -s" || true
+		dsmetool -n -1 -t "$HCID -n $HCID_OPTIONS" || true
 	else
 		start-stop-daemon --stop --quiet --exec "$HCID $HCID_OPTIONS" || true
 		sleep 1

Modified: projects/connectivity/bluez-utils-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/changelog	2008-06-24 08:47:11 UTC (rev 15676)
+++ projects/connectivity/bluez-utils-debian/trunk/changelog	2008-06-24 09:11:54 UTC (rev 15677)
@@ -1,7 +1,23 @@
+bluez-utils (3.34-0maemo1) unstable; urgency=low
+
+  * New upstream version
+  * Changes from upstream ChangeLog since 3.32:
+     - Use safe function versions for SDP client handling.
+     - Fix issue with RemoveDevice during discovery procedure.
+     - Fix collect for non-persistent service records.
+     - Add support for handling Simple Pairing.
+     - Add Simple Pairing support to Agent interface.
+     - Add ReleaseMode method to Adapter interface.
+     - Add DiscoverServices method to Device interface.
+     - Remove obsolete code and cleanup the repository.
+     - Move over to use the libgdbus API.
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 24 Jun 2008 08:46:52 +0000
+
 bluez-utils (3.32-0maemo1) unstable; urgency=low
 
   * New upstream version
-  * Enable A2DP and AVRCP support 
+  * Enable A2DP and AVRCP support
 
  -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 27 May 2008 08:49:23 +0000
 

Modified: projects/connectivity/bluez-utils-debian/trunk/control
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/control	2008-06-24 08:47:11 UTC (rev 15676)
+++ projects/connectivity/bluez-utils-debian/trunk/control	2008-06-24 09:11:54 UTC (rev 15677)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Johan Hedberg <johan.hedberg at nokia.com>
-Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.32), autotools-dev, cdbs, libdbus-1-dev, libglib2.0-dev, libhal-dev, libasound2-dev, libgstreamer-plugins-base0.10-dev
+Build-Depends: bison, debhelper (>> 4.1.0), flex, libbluetooth2-dev (>= 3.34), 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
@@ -20,7 +20,7 @@
 Package: bluez-utils-test
 Architecture: any
 Priority: extra
-Depends: bluez-utils (= ${Source-Version})
+Depends: bluez-utils (= ${Source-Version}), python2.5-gobject, python2.5-dbus
 Description: testing tools for bluez
  This package contains several test tools for testing the BlueZ stack
 

Modified: projects/connectivity/bluez-utils-debian/trunk/rules
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/rules	2008-06-24 08:47:11 UTC (rev 15676)
+++ projects/connectivity/bluez-utils-debian/trunk/rules	2008-06-24 09:11:54 UTC (rev 15677)
@@ -19,3 +19,11 @@
 
 install/bluez-utils::
 	install -D -m 0644 audio/audio.conf $(DEB_DESTDIR)/etc/bluetooth/audio.conf
+
+install/bluez-utils-test::
+	install -D -m 0755 hcid/simple-agent $(DEB_DESTDIR)/usr/bin/bluez-simple-agent
+	install -D -m 0755 hcid/test-adapter $(DEB_DESTDIR)/usr/bin/bluez-test-adapter
+	install -D -m 0755 hcid/test-device $(DEB_DESTDIR)/usr/bin/bluez-test-device
+	install -D -m 0755 hcid/test-discovery $(DEB_DESTDIR)/usr/bin/bluez-test-discovery
+	install -D -m 0755 hcid/test-manager $(DEB_DESTDIR)/usr/bin/bluez-test-manager
+	install -D -m 0755 hcid/list-devices $(DEB_DESTDIR)/usr/bin/bluez-list-devices