ooo-build r14910 - in branches/ooo-build-3-0-1: . bin patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Dec 22 12:53:41 2008
New Revision: 14910
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14910&view=rev

Log:
2008-12-22  Rene Engelhard  <rene debian org>  
  
        * bin/package-ooo: work around #i97491.


Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/package-ooo
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/bin/package-ooo
==============================================================================
--- branches/ooo-build-3-0-1/bin/package-ooo	(original)
+++ branches/ooo-build-3-0-1/bin/package-ooo	Mon Dec 22 12:53:41 2008
@@ -952,7 +952,9 @@
 			shift
 		done
 	}
-	move_wrappers pkg/openoffice.org-common ooffice oofromtemplate soffice unopkg
+	move_wrappers pkg/openoffice.org-common ooffice oofromtemplate unopkg
+	# FIXME: (temporarily?) disabled due to #i97491
+	#move_wrappers pkg/openoffice.org-common soffice
 	move_wrappers pkg/openoffice.org-base oobase
 	move_wrappers pkg/openoffice.org-writer oowriter ooweb
 	move_wrappers pkg/openoffice.org-calc oocalc
@@ -967,7 +969,7 @@
 	  fi &&
 	  ( cd pkg/openoffice.org-common/$d
 	    find -maxdepth 1 -type f \
-	       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+	       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\|soffice\)' \
 		   -exec mv {} $OODESTDIR/pkg/openoffice.org-core/$d \;
 	  ); \
 	done

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Mon Dec 22 12:53:41 2008
@@ -921,7 +921,8 @@
 oosplash-etc-openoffice-sofficerc.diff
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
-ubuntu-soffice-config.diff, mklose
+# FIXME: OOO300_m14 installs the binary as soffice. intended? #i97491
+#ubuntu-soffice-config.diff, mklose
 ubuntu-openoffice-java-common.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people