[ooo-build-commit] .: 2 commits - bin/unpack patches/dev300

[Andras Timar]

 bin/unpack                             |    2 +-
 patches/dev300/apply                   |    2 ++
 patches/dev300/fsfhu-splash.diff       |   17 +++++++++++++++++
 patches/dev300/fsfhu-vendor-win32.diff |   11 +++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 3ce738d1d1b570e3fb0638ea17449ef17803f99f
Author: Andras Timar <timar at fsf.hu>
Date:   Fri Apr 23 21:49:48 2010 +0200

    Fixed vendor name for localized Windows installer
    
    * bin/unpack:

diff --git a/bin/unpack b/bin/unpack
index f5928c3..e62a362 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -374,7 +374,7 @@ if test "z$PIECE" = "z"; then
     if [ -d $OOBUILDDIR/l10n ]; then
     for file in `find $OOBUILDDIR/l10n -type f -name "localize.sdf"` ; do
 	chmod 644 $file
-	perl -i -pe 's/(instsetoo_native\tinc_openoffice\\windows\\msi_languages\\Control.ulf.*OOO_CONTROL_124.*)Sun Microsystems, Inc./\1$ENV{"VENDORNAME"}/' $file
+	perl -i -pe 's/(instsetoo_native\tinc_openoffice\\windows\\msi_languages\\Control.ulf.*OOO_CONTROL_124.*)(Sun Microsystems, Inc.|Oracle)/\1$ENV{"VENDORNAME"}/' $file
     done
     fi
 fi
commit aad32dd4531897ff26f92bfdd339b15321bd1c81
Author: Andras Timar <timar at fsf.hu>
Date:   Fri Apr 23 21:44:57 2010 +0200

    FSF.hu splash and vendor name fix
    
    * patches/dev300/apply:
    * patches/dev300/fsfhu-splash.diff:
    * patches/dev300/fsfhu-vendor-win32.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c8f252d..f7189cc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3824,6 +3824,8 @@ border-types-dotted-dashed.diff, fate#307731, fate 307730
 SectionOwner => timar
 
 fsfhu-instset.diff 
+fsfhu-splash.diff
+fsfhu-vendor-win32.diff
 # Make CaptionOrderNumberingFirst true for Hungarian
 captionnumbering-hu.diff, i#110273, timar
 
diff --git a/patches/dev300/fsfhu-splash.diff b/patches/dev300/fsfhu-splash.diff
new file mode 100755
index 0000000..53548f2
--- /dev/null
+++ b/patches/dev300/fsfhu-splash.diff
@@ -0,0 +1,17 @@
+--- instsetoo_native/util/openoffice.lst.old	2010-04-13 17:48:03.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2010-04-14 17:29:11.000000000 +0200
+@@ -25,10 +25,10 @@ Globals
+ 			POOLPRODUCT 1
+ 			REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
+-			PROGRESSBARCOLOR 14,133,205
+-			PROGRESSSIZE 320,7
+-			PROGRESSPOSITION 185,206
+-			PROGRESSFRAMECOLOR 207,208,211
++			PROGRESSBARCOLOR 33,73,132
++			PROGRESSSIZE 412,7
++			PROGRESSPOSITION 14,280
++			PROGRESSFRAMECOLOR 165,165,165
+ 			NATIVEPROGRESS true
+ 			REGISTRYLAYERNAME Layers
+ 			SERVICEPACK 1
diff --git a/patches/dev300/fsfhu-vendor-win32.diff b/patches/dev300/fsfhu-vendor-win32.diff
new file mode 100644
index 0000000..763cf7d
--- /dev/null
+++ b/patches/dev300/fsfhu-vendor-win32.diff
@@ -0,0 +1,11 @@
+--- l10n/source/hu/localize.sdf	2010-04-23 21:13:50.939000000 +0200
++++ l10n/source/hu/localize.sdf	2010-04-23 10:30:26.681000000 +0200
+@@ -49237,7 +49237,7 @@
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_121				0	hu	Egy szinttel feljebb|				2002-02-02 02:02:02
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_122				0	hu	< &Vissza				2002-02-02 02:02:02
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_123				0	hu	Mégse				2002-02-02 02:02:02
+-instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_124				0	hu	A buildet a közösséggel együttműködésben az FSFhu készítette. A stáblista itt található: http://www.openoffice.org/welcome/credits.html				2002-02-02 02:02:02
++instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_124				0	hu	A buildet a közösséggel együttműködésben az FSF.hu Alapítvány készítette. A stáblista itt található: http://www.openoffice.org/welcome/credits.html				2002-02-02 02:02:02
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_125				0	hu	&Tovább >				2002-02-02 02:02:02
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_126				0	hu	{&TahomaBold10}Üdvözli az [ProductName] Telepítője				2002-02-02 02:02:02
+ instsetoo_native	inc_openoffice\windows\msi_languages\Control.ulf	0	LngText	OOO_CONTROL_127				0	hu	A Telepítő telepíteni fogja az [ProductName] alkalmazást a számítógépére. A folytatáshoz kattintson a Tovább gombra.				2002-02-02 02:02:02