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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-07-10 14:19:52 +0300 (Thu, 10 Jul 2008)
New Revision: 15751

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/debian/preinst
Log:
  * Added lots of debugging echo lines around the manipulation of the locale file
    in debian/{pre,post}inst


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-07-08 14:10:12 UTC (rev 15750)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-07-10 11:19:52 UTC (rev 15751)
@@ -1,3 +1,10 @@
+osso-af-startup (1.66-3) unstable; urgency=low
+
+  * Added lots of debugging echo lines around the manipulation of the locale file
+    in debian/{pre,post}inst
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 10 Jul 2008 14:12:50 +0300
+
 osso-af-startup (1.66-2) unstable; urgency=low
 
   * Create temporary locale file in /var/tmp, not in /tmp, because it creates a race

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-07-08 14:10:12 UTC (rev 15750)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-07-10 11:19:52 UTC (rev 15751)
@@ -18,12 +18,15 @@
 ln -s /var/lib/gconf /etc/osso-af-init/gconf-dir
 
 if test -f $LOCALE_TMP_FILE; then
+  echo "Moving preinst locale file $LOCALE_TMP_FILE to $LOCALE_FILE"
   mv -f $LOCALE_TMP_FILE $LOCALE_FILE
+  # startup wizard needs to be able to modify the locale
+  echo "Changing ownership of $LOCALE_FILE"
+  chown $USER:$GROUP $LOCALE_FILE
+else
+  echo "preinst locale file $LOCALE_TMP_FILE not found"
 fi
 
-# startup wizard needs to be able to modify the locale
-chown $USER:$GROUP /etc/osso-af-init/locale
-
 # # save the original for Restore Original Settings
 # cp -f /etc/osso-af-init/locale /etc/osso-af-init/locale.orig
 # chown $USER:$GROUP /etc/osso-af-init/locale.orig

Modified: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2008-07-08 14:10:12 UTC (rev 15750)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2008-07-10 11:19:52 UTC (rev 15751)
@@ -44,10 +44,14 @@
 fi
 
 if test -f $LOCALE_FILE; then
+  echo "osso-af-startup: preinst: Backing up existing locale file to $LOCALE_TMP_FILE"
   cp -af $LOCALE_FILE $LOCALE_TMP_FILE
 else
+  echo "osso-af-startup: preinst: Creating default locale file in $LOCALE_TMP_FILE"
   cat_default_locale_file > $LOCALE_TMP_FILE
 fi
 
+echo "osso-af-startup: preinst: Creating directory $LOCALE_DIR"
 mkdir -p $LOCALE_DIR
+echo "osso-af-startup: preinst: Generating default locale-orig file $LOCALE_ORIG_FILE"
 cat_default_locale_file > $LOCALE_ORIG_FILE