[maemo-commits] [maemo-commits] r15611 - in projects/haf/trunk/osso-af-startup: . debian services

[From: subversion at stage.maemo.org]

Author: dobrovol
Date: 2008-05-29 16:20:48 +0300 (Thu, 29 May 2008)
New Revision: 15611

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
Rolling  back the osso-af-startup to version 1.54-1


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-05-29 11:48:36 UTC (rev 15610)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-05-29 13:20:48 UTC (rev 15611)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.57)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.58)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-29 11:48:36 UTC (rev 15610)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-29 13:20:48 UTC (rev 15611)
@@ -1,5 +1,12 @@
 osso-af-startup (1.57-1) unstable; urgency=low
 
+  * Revert Fixes for bugs 85821 and 85539 (will go to version 1.54-1), patch will go to 
+    osso-startup-wizard
+
+ -- Natalia Dobrovolskaya <natalia.dobrovolskaya at nokia.com>  Thu, 29 May 2009 16:11:00 +0300
+
+osso-af-startup (1.57-1) unstable; urgency=low
+
   * Incomplete hack: When making /etc/osso-af-init/locale en_US, also set gconf key
   * Fixes: NB#85821
 

Modified: projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
===================================================================
--- projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2008-05-29 11:48:36 UTC (rev 15610)
+++ projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2008-05-29 13:20:48 UTC (rev 15611)
@@ -6,4 +6,4 @@
 user ALL = NOPASSWD: /etc/init.d/osso-hss stop
 user ALL = NOPASSWD: /usr/bin/osso-product-info
 user ALL = NOPASSWD: /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp
-user ALL = NOPASSWD: /bin/mv -f /tmp/locale .
+

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-29 11:48:36 UTC (rev 15610)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-29 13:20:48 UTC (rev 15611)
@@ -25,12 +25,6 @@
 # cancel 'set -e' because grep may return non-zero
 set +e
 
-if [ "x$USER" = "xroot" ]; then
-  _SUDO=''
-else
-  _SUDO='sudo'
-fi
-
 export AF_INIT_DIR=/etc/osso-af-init
 # user name is appended for multi-user Scratchbox
 USER=`whoami`
@@ -45,29 +39,7 @@
 # these could have changed since last sourcing
 source $AF_INIT_DIR/locale
 
-if [ -e $HOME/first-boot-flag ]; then
-  OSSO_PRODUCT_HARDWARE=`$_SUDO /usr/bin/osso-product-info -q OSSO_PRODUCT_HARDWARE`
-  if [ "x$OSSO_PRODUCT_HARDWARE" = "xRX-48" ]; then
-    # Recreate $AF_INIT_DIR/locale with en_US
-    cp -f $AF_INIT_DIR/locale /tmp
 
-    echo -n '' > /tmp/locale
-    echo 'unset LC_ALL' >> /tmp/locale
-    echo 'unset LANGUAGE' >> /tmp/locale
-    echo 'export LANG=en_US' >> /tmp/locale
-    echo 'export LC_MESSAGES=en_US' >> /tmp/locale
-
-    cd $AF_INIT_DIR && $_SUDO mv -f /tmp/locale .
-
-    source $AF_INIT_DIR/locale
-
-    # ... and inform input methods of the change
-    if test -x /usr/bin/gconftool-2; then
-      /usr/bin/gconftool-2 --set --type string /apps/osso/inputmethod/hildon-im-languages/language-0 'en_US'
-    fi
-  fi
-fi
-
 if [ -r $SESSION_BUS_ADDRESS_FILE ]; then
   source $SESSION_BUS_ADDRESS_FILE
 fi
@@ -150,6 +122,11 @@
 
   if [ ! -d /scratchbox ]; then
     if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
+      if [ "x$USER" = "xroot" ]; then
+        _SUDO=''
+      else
+        _SUDO='sudo'
+      fi
       $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp.tmp 2> /dev/null
       $_SUDO /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp 2> /dev/null
       unset _SUDO