ooo-build r14986 - in trunk: . bin patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan  1 17:10:31 2009
New Revision: 14986
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14986&view=rev

Log:
        * patches/dev300/apply, patches/dev300/go-oo-splash.diff,
          bin/package-ooo: use open{intro,about}_go-oo.bmp as intro/about
          for GoOo*. Adapt ProgressSize/ProgressPosition to show progress
          bar next to the Go-OO logo at the to


Added:
   trunk/patches/dev300/go-oo-splash.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Jan  1 17:10:31 2009
@@ -457,6 +457,13 @@
     done
 fi
 
+if echo "$DISTRO" | grep -q "GoOo"; then
+	for file in about intro ; do
+		cp $SRCDIR/open${file}_go-oo.bmp \
+			$OOINSTDIR/program/${file}.bmp
+	done
+fi
+
 # remove installed file even from the file list
 # Params: file_list file_to_remove
 remove_file()

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan  1 17:10:31 2009
@@ -123,17 +123,17 @@
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
 # go-oo.org Win32
-GoOoWin32: NovellLikeWin32, UnstableLibwpd
+GoOoWin32: NovellLikeWin32, UnstableLibwpd, GoOoSplash
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
-GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd
+GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd, GoOoSplash
 # Pardus
 Pardus2007: PardusOnly, LinuxCommon, NotDebian
 Pardus2008: PardusOnly, LinuxCommon, NotDebian, Gcc43
 # Solaris
 Solaris: NovellBase, UnstableExtensions
 # Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd
+GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd, GoOoSplash
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
 	      			LinuxOnly, SystemBits, \
@@ -1080,6 +1080,11 @@
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
+[ GoOoSplash ]
+# move progress bar for go-oo splash
+go-oo-splash.diff
+
+[ DebianBaseOnly ]
 # fix the splash progressbar colors
 debian-splash.diff
 

Added: trunk/patches/dev300/go-oo-splash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/go-oo-splash.diff	Thu Jan  1 17:10:31 2009
@@ -0,0 +1,13 @@
+--- instsetoo_native/util/openoffice.lst.orig	2009-01-01 15:59:14.000000000 +0100
++++ instsetoo_native/util/openoffice.lst	2009-01-01 16:01:25.000000000 +0100
+@@ -25,8 +25,8 @@
+             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
+ 			PROGRESSBARCOLOR 4,68,155
+-			PROGRESSSIZE 412,7
+-			PROGRESSPOSITION 14,230
++			PROGRESSSIZE 376,7
++			PROGRESSPOSITION 50,30
+ 			PROGRESSFRAMECOLOR 58,159,232
+ 			REGISTRYLAYERNAME Layers
+             SERVICEPACK 1