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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-25 12:04:56 +0300 (Wed, 25 Jun 2008)
New Revision: 15685

Modified:
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/debian/preinst
Log:
Overwrite locale.orig no matter what

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-25 07:49:15 UTC (rev 15684)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-25 09:04:56 UTC (rev 15685)
@@ -19,15 +19,6 @@
 
 if test -f $LOCALE_TMP_FILE; then
   mv -f $LOCALE_TMP_FILE $LOCALE_FILE
-
-  # 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
 
 # startup wizard needs to be able to modify the locale

Modified: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-25 07:49:15 UTC (rev 15684)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-25 09:04:56 UTC (rev 15685)
@@ -27,6 +27,7 @@
 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
 
 if test "x$1" = "xinstall"; then
   # walk the user through initial configuration wizards
@@ -46,3 +47,5 @@
 else
   cat_default_locale_file > $LOCALE_TMP_FILE
 fi
+
+cat_default_locale_file > $LOCALE_ORIG_FILE