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

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Dec 19 10:15:59 2008
New Revision: 14896
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14896&view=rev

Log:
2008-12-19  Rene Engelhard  <rene debian org>

        * configure.in: m14 == rc1
        * patches/dev300/apply: cws-swffixes02.diff is == ooo300-m13,
          svx-ppt-textstyle-fix.diff is in m14
        * patches/dev300/apply, patches/dev300/unxsplash-rework-m13.diff,
          patches/dev300/unxsplash-rework.diff: shuffle for m14



Added:
   branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework-m13.diff
      - copied unchanged from r14889, /branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/configure.in
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework.diff

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	Fri Dec 19 10:15:59 2008
@@ -1310,6 +1310,8 @@
    UPSTREAM_VERSION=3.0.0beta2
 elif test "$with_tag" = "OOO300_m9" ; then
    UPSTREAM_VERSION=3.0.0
+elif test "$with_tag" = "OOO300_m14" ; then
+   UPSTREAM_VERSION=3.0.1
 fi
 if test -n "$UPSTREAM_VERSION"; then
    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"

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	Fri Dec 19 10:15:59 2008
@@ -555,9 +555,13 @@
 gnome-vfs-late-init.diff, i#84137, jholesov
 
 
-[ QuickStarter ]
+[ QuickStarter < ooo300-m14 ]
+unxsplash-rework-m13.diff, i#60696, michael/jholesov
+
+[ QuickStarter >= ooo300-m14 ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
+[ QuickStarter ]
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
@@ -1009,7 +1013,7 @@
 # OpenJDK paths for some archs
 config_office-openjdk-paths.diff, i91783
 
-[ BuildBits >= ooo300-m13 ]
+[ BuildBits == ooo300-m13 ]
 # fix build after cws swffixes
 cws-swffixes02.diff, i#96970
 
@@ -2605,9 +2609,11 @@
 solenv-silent-mac-build.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
 slideshow-blink-text-fix.diff, i#96047, thorsten
-svx-ppt-textstyle-fix.diff, n#443127, thorsten
 canvas-directx-lostdevice-fix.diff, n#445628, thorsten
 
+[ Fixes < ooo300-m14 ]
+svx-ppt-textstyle-fix.diff, n#443127, thorsten
+
 [ ExtensionFixes ]
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten

Modified: branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/unxsplash-rework.diff	Fri Dec 19 10:15:59 2008
@@ -37,7 +37,7 @@
 @@ -7,6 +7,7 @@ mkdir: %_DEST%\bin%_EXT%\remote2
  ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
  ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
- ..\%__SRC%\bin\officeloader %_DEST%\bin%_EXT%\soffice
+ ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice
 +..\%__SRC%\bin\oosplash %_DEST%\bin%_EXT%\oosplash.bin
  ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
  ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe