[maemo-commits] [maemo-commits] r14041 - in projects/haf/trunk/osso-app-killer: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-24 16:50:41 +0300 (Mon, 24 Sep 2007)
New Revision: 14041

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
Log:
bug fixes


Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2007-09-24 13:45:35 UTC (rev 14040)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2007-09-24 13:50:41 UTC (rev 14041)
@@ -1,3 +1,12 @@
+osso-app-killer (1.16-1~unreleased) unstable; urgency=low
+
+  * Use osso-product-info, if available, to get the product name.
+  * Spare 'system/bluetooth' GConf keys in ROS. Fixes: NB#59060
+  * Use 'cat' instead of 'cp' to restore the locale file, avoiding the busybox
+    strangeness.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 24 Sep 2007 16:34:54 +0300
+
 osso-app-killer (1.15-1.1) unstable; urgency=low
 
   * Increasing the version, rebuilding with libdbus-1-3 is needed

Modified: projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2007-09-24 13:45:35 UTC (rev 14040)
+++ projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2007-09-24 13:50:41 UTC (rev 14041)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of osso-app-killer.
 #
-# Copyright (C) 2005-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2005-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -32,12 +32,23 @@
           rm -f $f
         done
         continue
+      elif [ "x$CUD" = "x" ]; then
+        for f in `find system -name *.xml`; do
+          # in ROS, paths having 'system/bluetooth' are preserved
+          echo "$f" | grep -e 'system\/bluetooth' > /dev/null
+          if [ $? = 0 ]; then
+            continue
+          fi
+          echo "$0: removing $f"
+          rm -f $f
+        done
+        continue
       fi
     elif [ "x$d" = "xapps" ]; then
       # special handling for subdirectory 'apps'
       if [ "x$CUD" = "x" ]; then
         for f in `find apps -name *.xml`; do
-          # in RFS, paths having 'telepathy' are preserved
+          # in ROS, paths having 'telepathy' are preserved
           echo "$f" | grep -e 'telepathy' > /dev/null
           if [ $? = 0 ]; then
             continue

Modified: projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2007-09-24 13:45:35 UTC (rev 14040)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2007-09-24 13:50:41 UTC (rev 14041)
@@ -3,7 +3,7 @@
 #
 # This file is part of osso-app-killer.
 #
-# Copyright (C) 2005-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2005-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -24,12 +24,17 @@
 DIR=/etc/osso-af-init
 
 # reset the Bluetooth name
+if [ -x /usr/bin/osso-product-info ]; then
+  NAME=`/usr/bin/osso-product-info -qOSSO_PRODUCT_NAME`
+else
+  NAME='Nokia N800'
+fi
 dbus-send --system --dest=org.bluez /org/bluez/hci0 \
-  org.bluez.Adapter.SetName string:'Nokia N800'
+  org.bluez.Adapter.SetName string:"$NAME"
 
 if [ "x$CUD" != "x" ]; then
   # restore the original language
-  cp -f $DIR/locale.orig $DIR/locale
+  cat $DIR/locale.orig > $DIR/locale
   USER=`whoami`
   if [ "x$USER" = "xroot" ]; then
     chown user:users $DIR/locale