[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Fridrich Strba]

 patches/dev300/apply             |    3 +--
 patches/dev300/go-oo-splash.diff |   16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit ae65382e8bffc4006d65512ec5ddb336e68281c8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 21 12:09:47 2010 +0200

    Make go-oo-splash.diff apply
    
    * patches/dev300/apply:
    * patches/dev300/go-oo-splash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4b05b93..4d23451 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1129,8 +1129,7 @@ reportdesign-mention-package-l10n.diff, rengelha
 
 [ GoOoSplash ]
 # move progress bar for go-oo splash
-# FIXME: 2010-04-23: doesn't appply, adapt to branding changes
-#go-oo-splash.diff
+go-oo-splash.diff
 
 [ SlackwareOnly ]
 SectionOwner => Slackware
diff --git a/patches/dev300/go-oo-splash.diff b/patches/dev300/go-oo-splash.diff
index 37d043b..8d8a706 100644
--- a/patches/dev300/go-oo-splash.diff
+++ b/patches/dev300/go-oo-splash.diff
@@ -1,17 +1,17 @@
 --- instsetoo_native/util/openoffice.lst.old	2010-03-03 17:50:21.000000000 +0100
 +++ instsetoo_native/util/openoffice.lst	2010-03-03 17:50:36.000000000 +0100
 @@ -25,10 +25,10 @@ Globals
-             POOLPRODUCT 1
-             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ 			POOLPRODUCT 1
+ 			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
--			PROGRESSFRAMECOLOR 58,159,232
+-			PROGRESSBARCOLOR 14,133,205
+-			PROGRESSSIZE 320,7
+-			PROGRESSPOSITION 185,206
+-			PROGRESSFRAMECOLOR 207,208,211
 +			PROGRESSBARCOLOR 186,189,182
 +			PROGRESSSIZE 186,5
 +			PROGRESSPOSITION 126,183
 +			PROGRESSFRAMECOLOR 255,255,255
+ 			NATIVEPROGRESS true
  			REGISTRYLAYERNAME Layers
-             SERVICEPACK 1
-             UPDATE_DATABASE 1
+ 			SERVICEPACK 1