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

Tue Feb 24 12:30:48 EET 2009

Author: schulhof
Date: 2009-02-24 12:30:38 +0200 (Tue, 24 Feb 2009)
New Revision: 17501

Removed:
   projects/haf/trunk/osso-af-startup/locale.rx48
Modified:
   projects/haf/trunk/osso-af-startup/debian/control
   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:
Removing/commenting locale stuff

Modified: projects/haf/trunk/osso-af-startup/debian/control
===================================================================

--- projects/haf/trunk/osso-af-startup/debian/control	2009-02-24 07:51:25 UTC (rev 17500)
+++ projects/haf/trunk/osso-af-startup/debian/control	2009-02-24 10:30:38 UTC (rev 17501)
@@ -13,8 +13,3 @@
  af-base-apps. Also includes D-BUS session bus starting script.
  These scripts are for the target only -- they have not been necessarily
  tested in Scratchbox.
-
-Package: osso-af-startup-locale-rx48
-Architecture: all
-Depends: osso-af-startup (>= ${Source-Version})
-Description: Default language file

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2009-02-24 07:51:25 UTC (rev 17500)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2009-02-24 10:30:38 UTC (rev 17501)
@@ -10,27 +10,27 @@
 GROUP=users
 HOME="$TGT/home/$USER"
 TMP_DIR=/var/tmp
-LOCALE_TMP_FILE=$TMP_DIR/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
+# LOCALE_TMP_FILE=$TMP_DIR/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
-  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
+# 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
 
-# # 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
+# # # 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
 
 update-rc.d af-services start 22 2 3 4 5 . stop 22 0 1 6 . > /dev/null
 update-rc.d af-startup start 50 2 3 4 . stop 21 0 1 6 . > /dev/null

Modified: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2009-02-24 07:51:25 UTC (rev 17500)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2009-02-24 10:30:38 UTC (rev 17501)
@@ -1,21 +1,21 @@
 #!/bin/sh
 
-cat_default_locale_file() # No args
-{
-cat <<'EOF'
-#!/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
+# }
 
-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
@@ -26,10 +26,10 @@
 GROUP=users
 HOME="$TGT/home/$USER"
 TMP_DIR=/var/tmp
-LOCALE_TMP_FILE=$TMP_DIR/osso-af-init.locale.tmp
-LOCALE_DIR=/usr/share/osso-af-init
-LOCALE_FILE=/etc/osso-af-init/locale
-LOCALE_ORIG_FILE=$LOCALE_DIR/locale.orig
+# LOCALE_TMP_FILE=$TMP_DIR/osso-af-init.locale.tmp
+# LOCALE_DIR=/usr/share/osso-af-init
+# LOCALE_FILE=/etc/osso-af-init/locale
+# LOCALE_ORIG_FILE=$LOCALE_DIR/locale.orig
 
 if test "x$1" = "xinstall"; then
   # walk the user through initial configuration wizards
@@ -47,15 +47,15 @@
 mkdir -p $TMP_DIR
 chmod 1777 $TMP_DIR
 
-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
+# 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

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2009-02-24 07:51:25 UTC (rev 17500)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2009-02-24 10:30:38 UTC (rev 17501)
@@ -57,8 +57,8 @@
 
 	# Add here commands to install the package into debian/osso-af-startup.
 #	$(MAKE) install DESTDIR=$(CURDIR)/debian/osso-af-startup
-	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-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
 
 
 # Build architecture-independent files here.

Deleted: projects/haf/trunk/osso-af-startup/locale.rx48
===================================================================
--- projects/haf/trunk/osso-af-startup/locale.rx48	2009-02-24 07:51:25 UTC (rev 17500)
+++ projects/haf/trunk/osso-af-startup/locale.rx48	2009-02-24 10:30:38 UTC (rev 17501)
@@ -1,5 +0,0 @@
-#!/bin/sh
-unset LC_ALL
-unset LANGUAGE
-export LANG=en_US
-export LC_MESSAGES=en_US


