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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-18 13:53:16 +0300 (Wed, 18 Jun 2008)
New Revision: 15665

Added:
   projects/haf/trunk/osso-af-startup/locale
Removed:
   projects/haf/trunk/osso-af-startup/services/locale
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
   projects/haf/trunk/osso-af-startup/debian/rules
Log:
  * Maintain /etc/osso-af-init/locale solely via pre/postinst and do not ship it at all.
    If a version of locale is present on the system, don't touch it.


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-17 09:52:55 UTC (rev 15664)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-18 10:53:16 UTC (rev 15665)
@@ -1,3 +1,10 @@
+osso-af-startup (1.64-1) unstable; urgency=low
+
+  * Maintain /etc/osso-af-init/locale solely via pre/postinst and do not ship it at all.
+    If a version of locale is present on the system, don't touch it.
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 18 Jun 2008 13:32:51 +0300
+
 osso-af-startup (1.63-2) unstable; urgency=low
 
   * Failed to build. Oops!

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-17 09:52:55 UTC (rev 15664)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-18 10:53:16 UTC (rev 15665)
@@ -9,10 +9,19 @@
 USER=user
 GROUP=users
 HOME="$TGT/home/$USER"
+LOCALE_TMP_FILE=/tmp/osso-af-init.locale.tmp
 
 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
+  if ! test -f /usr/share/osso-af-init/locale.orig
+    cp -f $LOCALE_TMP_FILE /usr/share/osso-af-init/locale.orig
+  fi
+
+  mv -f $LOCALE_TMP_FILE /etc/osso-af-init/locale
+fi
+
 # startup wizard needs to be able to modify the locale
 chown $USER:$GROUP /etc/osso-af-init/locale
 

Modified: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-17 09:52:55 UTC (rev 15664)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2008-06-18 10:53:16 UTC (rev 15665)
@@ -1,5 +1,21 @@
 #!/bin/sh
 
+cat_default_locale_file() # No args
+{
+cat <<'EOF'
+#!/bin/sh
+
+if [ -f /usr/share/osso-af-init/locale ]; then
+  source /usr/share/osso-af-init/locale
+else
+  unset LC_ALL
+  unset LANGUAGE
+  export LANG=en_GB
+  export LC_MESSAGES=en_GB
+fi
+EOF
+}
+
 TGT=''
 if [ -e /targets/links/scratchbox.config ] ; then
         . /targets/links/scratchbox.config
@@ -9,6 +25,7 @@
 USER=user
 GROUP=users
 HOME="$TGT/home/$USER"
+LOCALE_TMP_FILE=/tmp/osso-af-init.locale.tmp
 
 if test "x$1" = "xinstall"; then
   # walk the user through initial configuration wizards
@@ -22,3 +39,9 @@
   touch $HOME/first-boot-flag
   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
+else
+  cat_default_locale_file > $LOCALE_TMP_FILE
+fi

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-17 09:52:55 UTC (rev 15664)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-18 10:53:16 UTC (rev 15665)
@@ -93,9 +93,6 @@
 	mkdir -p $(CURDIR)/debian/osso-af-startup-locale-rx48/usr/share/osso-af-init
 	cp -a $(CURDIR)/locale.rx48 $(CURDIR)/debian/osso-af-startup-locale-rx48/usr/share/osso-af-init/locale
 
-	mkdir -p $(CURDIR)/debian/osso-af-startup/usr/share/osso-af-init
-	cp -a $(CURDIR)/services/locale $(CURDIR)/debian/osso-af-startup/usr/share/osso-af-init/locale.orig
-
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums

Copied: projects/haf/trunk/osso-af-startup/locale (from rev 15662, projects/haf/trunk/osso-af-startup/services/locale)

Deleted: projects/haf/trunk/osso-af-startup/services/locale
===================================================================
--- projects/haf/trunk/osso-af-startup/services/locale	2008-06-17 09:52:55 UTC (rev 15664)
+++ projects/haf/trunk/osso-af-startup/services/locale	2008-06-18 10:53:16 UTC (rev 15665)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -f /usr/share/osso-af-init/locale ]; then
-  source /usr/share/osso-af-init/locale
-else
-  unset LC_ALL
-  unset LANGUAGE
-  export LANG=en_GB
-  export LC_MESSAGES=en_GB
-fi