[maemo-commits] [maemo-commits] r15684 - projects/haf/trunk/osso-af-startup/debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-25 10:49:15 +0300 (Wed, 25 Jun 2008)
New Revision: 15684

Modified:
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/debian/preinst
Log:
Keep locale.orig if encountered.


Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-24 12:59:12 UTC (rev 15683)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-25 07:49:15 UTC (rev 15684)
@@ -10,15 +10,23 @@
 GROUP=users
 HOME="$TGT/home/$USER"
 LOCALE_TMP_FILE=/tmp/osso-af-init.locale.tmp
+LOCALE_FILE=/etc/osso-af-init/locale
+LOCALE_ORIG_FILE=/usr/share/osso-af-init/locale.orig
+LOCALE_ORIG_FILE_OLD=/etc/osso-af-init/locale.orig
 
 rm -f /etc/osso-af-init/gconf-dir
 ln -s /var/lib/gconf /etc/osso-af-init/gconf-dir
 
 if test -f $LOCALE_TMP_FILE; then
-  mv -f $LOCALE_TMP_FILE /etc/osso-af-init/locale
+  mv -f $LOCALE_TMP_FILE $LOCALE_FILE
 
-  if ! test -f /usr/share/osso-af-init/locale.orig; then
-    cp -f $LOCALE_TMP_FILE /usr/share/osso-af-init/locale.orig
+  # What to do if a locale.orig file is not present
+  if ! test -f $LOCALE_ORIG_FILE; then
+    if test -f $LOCALE_ORIG_FILE_OLD; then
+      cp -f $LOCALE_ORIG_FILE_OLD $LOCALE_ORIG_FILE
+    else
+      cp -f $LOCALE_FILE $LOCALE_ORIG_FILE
+    fi
   fi
 fi
 

Modified: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-24 12:59:12 UTC (rev 15683)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-25 07:49:15 UTC (rev 15684)
@@ -26,6 +26,7 @@
 GROUP=users
 HOME="$TGT/home/$USER"
 LOCALE_TMP_FILE=/tmp/osso-af-init.locale.tmp
+LOCALE_FILE=/etc/osso-af-init/locale
 
 if test "x$1" = "xinstall"; then
   # walk the user through initial configuration wizards
@@ -40,8 +41,8 @@
   chown $USER:$GROUP $HOME/first-boot-flag
 fi
 
-if test -f /etc/osso-af-init/locale; then
-  cp -af /etc/osso-af-init/locale $LOCALE_TMP_FILE
+if test -f $LOCALE_FILE; then
+  cp -af $LOCALE_FILE $LOCALE_TMP_FILE
 else
   cat_default_locale_file > $LOCALE_TMP_FILE
 fi