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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2009-05-06 19:59:59 +0300 (Wed, 06 May 2009)
New Revision: 18268

Modified:
   projects/connectivity/maemo-bluez-compat/trunk/configure.ac
   projects/connectivity/maemo-bluez-compat/trunk/debian/changelog
   projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-restore.sh
Log:
Prepare 0.19

Modified: projects/connectivity/maemo-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/maemo-bluez-compat/trunk/configure.ac	2009-05-06 13:36:12 UTC (rev 18267)
+++ projects/connectivity/maemo-bluez-compat/trunk/configure.ac	2009-05-06 16:59:59 UTC (rev 18268)
@@ -1,4 +1,4 @@
-AC_INIT([maemo-bluez-compat],[0.18])
+AC_INIT([maemo-bluez-compat],[0.19])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/maemo-bluez-compat/trunk/debian/changelog
===================================================================
--- projects/connectivity/maemo-bluez-compat/trunk/debian/changelog	2009-05-06 13:36:12 UTC (rev 18267)
+++ projects/connectivity/maemo-bluez-compat/trunk/debian/changelog	2009-05-06 16:59:59 UTC (rev 18268)
@@ -1,3 +1,10 @@
+maemo-bluez-compat (0.19) unstable; urgency=low
+
+  * Fixes: NB#97115 - Restored backup does not work correctly if bluetooth
+  address has changed
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Wed, 06 May 2009 19:46:43 +0300
+
 maemo-bluez-compat (0.18) unstable; urgency=low
 
   * Second attempt at fixing 99102

Modified: projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-restore.sh	2009-05-06 13:36:12 UTC (rev 18267)
+++ projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-restore.sh	2009-05-06 16:59:59 UTC (rev 18268)
@@ -17,6 +17,10 @@
 
 [ -z "$MY_BDA" ] && exit 1
 
+if [ -f "/var/lib/bluetooth/bdaddr.hci0" ] ; then
+        echo $MY_BDA > /var/lib/bluetooth/bdaddr.hci0
+fi
+
 CORRECT_DIR="/var/lib/bluetooth/$MY_BDA"
 
 OLD_DIR=`find /var/lib/bluetooth -maxdepth 1 -type d \! -name "$MY_BDA" \! -name bluetooth|head -n 1`