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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-01-12 16:42:48 +0200 (Mon, 12 Jan 2009)
New Revision: 17101

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
Fixing NB#91026

Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2009-01-12 13:04:49 UTC (rev 17100)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2009-01-12 14:42:48 UTC (rev 17101)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.75)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.76)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2009-01-12 13:04:49 UTC (rev 17100)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2009-01-12 14:42:48 UTC (rev 17101)
@@ -1,3 +1,10 @@
+osso-af-startup (1.76-1) unstable; urgency=low
+
+  * Changed MYDOCSDIR to /media/mmc2
+  * Fixes: NB#91026
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 12 Jan 2009 15:38:47 +0200
+
 osso-af-startup (1.75-1) unstable; urgency=low
 
   * 32768 max file descriptors in top-scripts/af-services

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-01-12 13:04:49 UTC (rev 17100)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-01-12 14:42:48 UTC (rev 17101)
@@ -94,9 +94,6 @@
     mkdir $STATESAVEDIR
   fi
 
-  # The MyDocs directory
-  export MYDOCSDIR=$HOME/MyDocs
-
   if [ ! -d /scratchbox ]; then
     if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
       if [ "x$USER" = "xroot" ]; then
@@ -143,6 +140,13 @@
   # MMC swap file location (directory)
   export MMC_SWAP_LOCATION=$MMC_MOUNTPOINT
 
+  # The MyDocs directory
+  if test "x$INTERNAL_MMC_MOUNTPOINT" = "x"; then
+    export MYDOCSDIR=$HOME/MyDocs
+  else
+    export MYDOCSDIR=$INTERNAL_MMC_MOUNTPOINT
+  fi
+
   source_if_is osso-gtk.defs
   source_if_is matchbox.defs
   source_if_is keyboard.defs