[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/ooop-win32-installer-branding.diff |   91 ----------------------
 1 file changed, 91 deletions(-)

New commits:
commit 16adc87de9cefabb17408d083a052c656fb506c9
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sat Apr 9 09:29:45 2011 +0200

    Changes of OxygenOffice branding

diff --git a/patches/dev300/ooop-win32-installer-branding.diff b/patches/dev300/ooop-win32-installer-branding.diff
index 0981887..8dad08d 100644
--- a/patches/dev300/ooop-win32-installer-branding.diff
+++ b/patches/dev300/ooop-win32-installer-branding.diff
@@ -9,94 +9,3 @@
  
  [OOO_CONTROL_125]
  en-US = "&Next >"
---- instsetoo_native/util/makefile.mk.orig	2011-01-23 07:49:15.000000000 +0100
-+++ instsetoo_native/util/makefile.mk	2011-01-23 07:49:51.000000000 +0100
-@@ -346,16 +346,16 @@
-     $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
--    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
--    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
--    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
--    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+    $(COPY) $(PRJ)$/res$/nologobanner_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/nologobanner_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/nologobanner_ooop.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/nologobanner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/nologobanner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
- 
- .IF "$(OS)" == "WNT"
- 
---- 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
-@@ -91,11 +91,11 @@
- 			USE_FILEVERSION 1
- 			LIBRARYVERSION 9.3.0
- 			PATCHCODEFILE ooo_patchcodes.txt
--			DOWNLOADBANNER	ooobanner.bmp
--			DOWNLOADBITMAP	ooobitmap.bmp
--			DOWNLOADBANNER_BR	brobanner.bmp
--			DOWNLOADBITMAP_BR	brobitmap.bmp
--			DOWNLOADSETUPICO	ooosetup.ico
-+            DOWNLOADBANNER	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP	ooobitmap_ooop.bmp
-+            DOWNLOADBANNER_BR	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP_BR	ooobitmap_ooop.bmp
-+            DOWNLOADSETUPICO	ooosetup.ico
- 			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-             STARTCENTER_INFO_URL http://www.libreoffice.org/
-@@ -161,9 +161,11 @@
- 			LIBRARYVERSION 9.3.0
- 			PATCHCODEFILE ooo_patchcodes.txt
- 			JAVAPRODUCT 1
--			DOWNLOADBANNER	ooobanner.bmp
--			DOWNLOADBITMAP	ooobitmap.bmp
--			DOWNLOADSETUPICO	ooosetup.ico
-+            DOWNLOADBANNER	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP	ooobitmap_ooop.bmp
-+            DOWNLOADBANNER_BR	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP_BR	ooobitmap_ooop.bmp
-+            DOWNLOADSETUPICO	ooosetup.ico
- 			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-             STARTCENTER_INFO_URL http://www.libreoffice.org/
-@@ -304,9 +304,11 @@
- 			LIBRARYVERSION 9.3.0
- 			PATCHCODEFILE ooodev_patchcodes.txt
- 			CODEFILENAME codes_ooodev.txt
--			DOWNLOADBANNER	ooobanner.bmp
--			DOWNLOADBITMAP	ooobitmap.bmp
--			DOWNLOADSETUPICO	ooosetup.ico
-+            DOWNLOADBANNER	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP	ooobitmap_ooop.bmp
-+            DOWNLOADBANNER_BR	ooobanner_ooop.bmp
-+            DOWNLOADBITMAP_BR	ooobitmap_ooop.bmp
-+            DOWNLOADSETUPICO	ooosetup.ico
- 			LOCALUSERDIR $ORIGIN/..
- 			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-@@ -349,9 +349,9 @@
-             PCPFILENAME ure.pcp
-             POOLPRODUCT 0
-             GLOBALFILEGID gid_File_Dl_Cppu
--            DOWNLOADBANNER urebanner.bmp
--            DOWNLOADBITMAP urebitmap.bmp
--            DOWNLOADSETUPICO ooosetup.ico
-+            DOWNLOADBANNER urebanner.bmp
-+            DOWNLOADBITMAP urebitmap.bmp
-+            DOWNLOADSETUPICO ooosetup.ico
-             DONTUSESTARTMENUFOLDER 1
-             SERVICESPROJEKT 1
-             RELATIVE_PATHES_IN_DDF 1