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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-08-09 12:40:35 +0300 (Thu, 09 Aug 2007)
New Revision: 13077

Modified:
   projects/connectivity/osso-bluez-compat/trunk/configure.ac
   projects/connectivity/osso-bluez-compat/trunk/debian/changelog
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
Log:
Fix restoring of original device name. Fixes: NB#50798

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-09 06:57:53 UTC (rev 13076)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-09 09:40:35 UTC (rev 13077)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.5.1])
+AC_INIT([osso-bluez-compat],[0.6])
 
 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-08-09 06:57:53 UTC (rev 13076)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-08-09 09:40:35 UTC (rev 13077)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.6) unstable; urgency=low
+
+  * Fix restoring of original device name. Fixes: NB#50798
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Thu,  9 Aug 2007 12:30:18 +0300
+
 osso-bluez-compat (0.5.1) unstable; urgency=low
 
   *  New version built against new D-Bus

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-09 06:57:53 UTC (rev 13076)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-09 09:40:35 UTC (rev 13077)
@@ -1,4 +1,17 @@
 #!/bin/sh
 
+AF_DEFINES="/etc/osso-af-init/af-defines.sh"
+PRODUCT_NAME="Nokia Tablet"
+
+if [ "$OSSO_PRODUCT_NAME" ]; then
+	PRODUCT_NAME="Nokia $OSSO_PRODUCT_NAME"
+elif [ -f $AF_DEFINES ]; then
+	. $AF_DEFINES
+	if [ "$OSSO_PRODUCT_NAME" ]; then
+		PRODUCT_NAME="$Nokia $OSSO_PRODUCT_NAME"
+	fi
+fi
+
+dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$PRODUCT_NAME"
 dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetDiscoverableTimeout uint32:0
 dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:off