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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-16 16:12:29 +0300 (Mon, 16 Jun 2008)
New Revision: 15654

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
Log:
  * Restore locale from /usr/share/osso-af-startup/locale.orig, not from
    /etc/osso-af-init/locale.orig


Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2008-06-16 13:00:31 UTC (rev 15653)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2008-06-16 13:12:29 UTC (rev 15654)
@@ -1,3 +1,10 @@
+osso-app-killer (1.20-1) unstable; urgency=low
+
+  * Restore locale from /usr/share/osso-af-startup/locale.orig, not from
+    /etc/osso-af-init/locale.orig
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 16 Jun 2008 16:05:47 +0300
+
 osso-app-killer (1.19-1) unstable; urgency=low
 
   * Added 'RX-48' to the HW-specific part of CUD. Fixes: NB#78472

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	2008-06-16 13:00:31 UTC (rev 15653)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2008-06-16 13:12:29 UTC (rev 15654)
@@ -22,6 +22,7 @@
 # 02110-1301 USA
 
 DIR=/etc/osso-af-init
+DEFAULT_LOCALE_DIR=/usr/share/osso-af-startup
 
 # reset the Bluetooth name
 if [ -x /usr/bin/osso-product-info ]; then
@@ -34,7 +35,7 @@
 
 if [ "x$CUD" != "x" ]; then
   # restore the original language
-  cat $DIR/locale.orig > $DIR/locale
+  cat $DEFAULT_LOCALE_DIR/locale.orig > $DIR/locale
   USER=`whoami`
   if [ "x$USER" = "xroot" ]; then
     chown user:users $DIR/locale