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

Fridrich Strba fridrich at kemper.freedesktop.org
Thu Apr 22 09:29:51 PDT 2010 

 patches/dev300/apply                                    |    7 -
 patches/dev300/novell-win32-installer-branding-m14.diff |  100 ++++++++++++++++
 patches/dev300/novell-win32-installer-branding.diff     |    8 -
 3 files changed, 110 insertions(+), 5 deletions(-)

New commits:
commit e028c1dd2a103046cc5501040b0f63443f1cd055
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 22 18:28:01 2010 +0200

    Adapting patch to new milestone
    
    * patches/dev300/apply:
    * patches/dev300/novell-win32-installer-branding-m14.diff:
    * patches/dev300/novell-win32-installer-branding.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1ac969c..bdaa38c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1394,10 +1394,15 @@ novell-win32-drop-win9x.diff
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 
-novell-win32-installer-branding.diff
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
+[ NovellOnlyWin32 < ooo320-m14 ]
+novell-win32-installer-branding-m14.diff
+
+[ NovellOnlyWin32 >= ooo320-m14 ]
+novell-win32-installer-branding.diff
+
 # drop stuff that is needed only on Win9x
 novell-win32-drop-win9x.diff
 
diff --git a/patches/dev300/novell-win32-installer-branding-m14.diff b/patches/dev300/novell-win32-installer-branding-m14.diff
new file mode 100644
index 0000000..59cf0b5
--- /dev/null
+++ b/patches/dev300/novell-win32-installer-branding-m14.diff
@@ -0,0 +1,100 @@
+--- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
++++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+@@ -379,7 +379,7 @@
+ 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 Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+ 
+ [OOO_CONTROL_125]
+ en-US = "&Next >"
+--- 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_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++	$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++	$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+ 
+--- instsetoo_native/util/openoffice.lst
++++ instsetoo_native/util/openoffice.lst
+@@ -29,9 +29,9 @@
+ 			USE_FILEVERSION 1
+ 			LIBRARYVERSION 9.2.0
+ 			PATCHCODEFILE ooo_patchcodes.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.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
+@@ -76,9 +76,9 @@
+ 			LIBRARYVERSION 9.2.0
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.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
+@@ -122,9 +122,9 @@
+ 			LIBRARYVERSION 9.2.0
+ 			PATCHCODEFILE ooodev_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.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_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+             DONTUSESTARTMENUFOLDER 1
+             SERVICESPROJEKT 1
+             RELATIVE_PATHES_IN_DDF 1
+@@ -92,9 +92,9 @@
+             NOVERSIONINDIRNAME 0
+             NOSPACEINDIRECTORYNAME 1
+             CHANGETARGETDIR 1
+-            DOWNLOADBANNER ooosdkbanner.bmp
+-            DOWNLOADBITMAP ooosdkbitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+             DONTUSESTARTMENUFOLDER 1
+             RELATIVE_PATHES_IN_DDF 1
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 59cf0b5..9a6101a 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -4,7 +4,7 @@
  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 Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
  
  [OOO_CONTROL_125]
@@ -35,7 +35,7 @@
 +++ instsetoo_native/util/openoffice.lst
 @@ -29,9 +29,9 @@
  			USE_FILEVERSION 1
- 			LIBRARYVERSION 9.2.0
+ 			LIBRARYVERSION 9.2.1
  			PATCHCODEFILE ooo_patchcodes.txt
 -			DOWNLOADBANNER	ooobanner.bmp
 -			DOWNLOADBITMAP	ooobitmap.bmp
@@ -47,7 +47,7 @@
              STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
              STARTCENTER_INFO_URL http://www.go-oo.org
 @@ -76,9 +76,9 @@
- 			LIBRARYVERSION 9.2.0
+ 			LIBRARYVERSION 9.2.1
  			PATCHCODEFILE ooo_patchcodes.txt
  			JAVAPRODUCT 1
 -			DOWNLOADBANNER	ooobanner.bmp
@@ -60,7 +60,7 @@
              STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
              STARTCENTER_INFO_URL http://www.go-oo.org
 @@ -122,9 +122,9 @@
- 			LIBRARYVERSION 9.2.0
+ 			LIBRARYVERSION 9.2.1
  			PATCHCODEFILE ooodev_patchcodes.txt
  			CODEFILENAME codes_ooodev.txt
 -			DOWNLOADBANNER	ooobanner.bmp

More information about the ooo-build-commit mailing list