ooo-build r14052 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Sep 24 08:17:36 2008
New Revision: 14052
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14052&view=rev

Log:
08-09-24  Rene Engelhard  <rene debian org>

        * patches/src680/soffice-detect-mozilla-certificates.diff: optimize
          (see bugs.debian.org/499062)


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff

Modified: branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/soffice-detect-mozilla-certificates.diff	Wed Sep 24 08:17:36 2008
@@ -5,7 +5,7 @@
 diff -u -u -r1.25 soffice.sh
 --- desktop/scripts/soffice.sh	5 Jul 2006 22:33:58 -0000	1.25
 +++ desktop/scripts/soffice.sh	9 Sep 2006 11:07:33 -0000
-@@ -189,6 +189,24 @@
+@@ -189,6 +189,29 @@
  OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
  export OPENOFFICE_MOZILLA_FIVE_HOME
  
@@ -18,7 +18,12 @@
 +		fi;
 +	done
 +	if [ -n "$dir" ]; then
-+		cert8=`find $dir -name "cert8.db" | head -n 1`
++		# In most case cert8.db will be in $dir/*/cert8.db.
++	        # Test this first. Do a full search otherwise.
++		cert8=`find $dir -maxdepth 2-name "cert8.db" | head -n 1`
++	        if [ ! -n "$cert8" ]; then
++			cert8=`find $dir -name "cert8.db" | head -n 1`
++		fi
 +		if [ -n "$cert8" ]; then
 +			profiledir=`dirname "$cert8"`
 +			MOZILLA_CERTIFICATE_FOLDER=$profiledir