[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/go-oo-win32-installer-branding.diff |   69 ++++++++++++++-------
 1 file changed, 46 insertions(+), 23 deletions(-)

New commits:
commit 082cd3bb2fdb96eb3760e45129c15c485831553e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 7 12:08:14 2010 +0200

    Massage a patch to apply

diff --git a/patches/dev300/go-oo-win32-installer-branding.diff b/patches/dev300/go-oo-win32-installer-branding.diff
index f018975..0d15f41 100644
--- a/patches/dev300/go-oo-win32-installer-branding.diff
+++ b/patches/dev300/go-oo-win32-installer-branding.diff
@@ -4,41 +4,38 @@
  en-US = "Cancel"
  
  [OOO_CONTROL_124]
--en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+-en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
 +en-US = "Build contributed in collaboration with the community by Go-oo. For credits, see: http://www.openoffice.org/welcome/credits.html"
  
  [OOO_CONTROL_125]
  en-US = "&Next >"
---- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
-+++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
-@@ -372,9 +372,17 @@
-     $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
+@@ -372,9 +372,15 @@
+ 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ 	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+-	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
 +    $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 +    $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 +    $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 +    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
  
  
-dummy line to avoid confusing diff-mode
---- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
-+++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
-@@ -85,9 +85,9 @@
+--- instsetoo_native/util/openoffice.lst
++++ instsetoo_native/util/openoffice.lst
+@@ -29,9 +29,9 @@
  			USE_FILEVERSION 1
- 			LIBRARYVERSION 9.2.0
+ 			LIBRARYVERSION 9.3.0
  			PATCHCODEFILE ooo_patchcodes.txt
 -			DOWNLOADBANNER	ooobanner.bmp
 -			DOWNLOADBITMAP	ooobitmap.bmp
@@ -49,20 +46,46 @@ dummy line to avoid confusing diff-mode
  			RELATIVE_PATHES_IN_DDF 1
              STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
              STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -149,9 +149,9 @@
- 			LIBRARYVERSION 9.2.0
+@@ -76,9 +76,9 @@
+ 			LIBRARYVERSION 9.3.0
  			PATCHCODEFILE ooo_patchcodes.txt
  			JAVAPRODUCT 1
 -			DOWNLOADBANNER	ooobanner.bmp
 -			DOWNLOADBITMAP	ooobitmap.bmp
 -			DOWNLOADSETUPICO	ooosetup.ico
-+            DOWNLOADBANNER	ooobanner__go-oo.bmp
-+            DOWNLOADBITMAP	ooobitmap__go-oo.bmp
++            DOWNLOADBANNER	ooobanner_go-oo.bmp
++            DOWNLOADBITMAP	ooobitmap_go-oo.bmp
 +            DOWNLOADSETUPICO	ooosetup_go-oo.ico
  			RELATIVE_PATHES_IN_DDF 1
              STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
              STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -307,9 +307,9 @@
+@@ -122,9 +122,9 @@
+ 			LIBRARYVERSION 9.3.0
+ 			PATCHCODEFILE ooodev_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++            DOWNLOADBANNER	ooobanner_go-oo.bmp
++            DOWNLOADBITMAP	ooobitmap_go-oo.bmp
++            DOWNLOADSETUPICO	ooosetup_go-oo.ico
+ 			LOCALUSERDIR $ORIGIN/..
+ 			RELATIVE_PATHES_IN_DDF 1
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+@@ -150,9 +150,9 @@
+             PCPFILENAME ure.pcp
+             POOLPRODUCT 0
+             GLOBALFILEGID gid_File_Dl_Cppu
+-            DOWNLOADBANNER urebanner.bmp
+-            DOWNLOADBITMAP urebitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_go-oo.bmp
++            DOWNLOADBITMAP ooobitmap_go-oo.bmp
++            DOWNLOADSETUPICO ooosetup_go-oo.ico
+             DONTUSESTARTMENUFOLDER 1
+             SERVICESPROJEKT 1
+             RELATIVE_PATHES_IN_DDF 1
+@@ -92,9 +92,9 @@
              NOVERSIONINDIRNAME 0
              NOSPACEINDIRECTORYNAME 1
              CHANGETARGETDIR 1