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

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan  8 15:00:59 2009
New Revision: 15032
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15032&view=rev

Log:
2009-01-08  Rene Engelhard  <rene debian org>

        * bin/package-ooo: remove work around for #i97491 again
        * configure.in: m15 is rc2
        * patches/dev300/apply: gengal-three-layer-install* is in m15


Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/package-ooo
   branches/ooo-build-3-0-1/configure.in
   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	Thu Jan  8 15:00:59 2009
@@ -967,7 +967,7 @@
 	  fi &&
 	  ( cd pkg/openoffice.org-common/$d
 	    find -maxdepth 1 -type f \
-	       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\|soffice\)' \
+	       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
 		   -exec mv {} $OODESTDIR/pkg/openoffice.org-core/$d \;
 	  ); \
 	done

Modified: branches/ooo-build-3-0-1/configure.in
==============================================================================
--- branches/ooo-build-3-0-1/configure.in	(original)
+++ branches/ooo-build-3-0-1/configure.in	Thu Jan  8 15:00:59 2009
@@ -1310,7 +1310,7 @@
    UPSTREAM_VERSION=3.0.0beta2
 elif test "$with_tag" = "OOO300_m9" ; then
    UPSTREAM_VERSION=3.0.0
-elif test "$with_tag" = "OOO300_m14" ; then
+elif test "$with_tag" = "OOO300_m15" ; then
    UPSTREAM_VERSION=3.0.1
 fi
 if test -n "$UPSTREAM_VERSION"; then

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	Thu Jan  8 15:00:59 2009
@@ -471,10 +471,12 @@
 # import tooltip for userforms
 import-controls-tooltip.diff, i#90124, noelpwer
 
+[ Fixes < ooo300-m15 ]
 # fix gengal for three layer install
 gengal-three-layer-install-svx.diff, i#89713, jannieuw
 gengal-three-layer-install-scp2.diff, i#89713, jannieuw
 
+[ Fixes ]
 # initialize the default locale in the resource manager
 # for example, it fixes unopkg to do not show random localization
 tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
@@ -943,8 +945,7 @@
 oosplash-etc-openoffice-sofficerc.diff
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
-# FIXME: OOO300_m14 installs the binary as soffice. intended? #i97491
-#ubuntu-soffice-config.diff, mklose
+ubuntu-soffice-config.diff, mklose
 ubuntu-openoffice-java-common.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people