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

[Kalman "" Szalai]

 patches/dev300/ooop-win32-installer-branding.diff |   35 ++++++++++------------
 1 file changed, 17 insertions(+), 18 deletions(-)

New commits:
commit 35552b1d62171cc8598bec5fae87097b2b98fd5a
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sun Jan 23 07:56:23 2011 +0100

    Fix for OxygenOffice branding
    
    Not LibreOffice relevant

diff --git a/patches/dev300/ooop-win32-installer-branding.diff b/patches/dev300/ooop-win32-installer-branding.diff
index 5a7e998..d34873d 100644
--- a/patches/dev300/ooop-win32-installer-branding.diff
+++ b/patches/dev300/ooop-win32-installer-branding.diff
@@ -9,32 +9,32 @@
  
  [OOO_CONTROL_125]
  en-US = "&Next >"
---- instsetoo_native/util/makefile.mk.old	2010-12-25 10:19:09.000000000 +0100
-+++ instsetoo_native/util/makefile.mk	2010-12-25 10:31:48.000000000 +0100
-@@ -341,11 +341,21 @@
-     $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
-     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+--- 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 $(MSISDKOOTEMPLATEDIR)$/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
-+    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.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"
  
@@ -87,7 +87,6 @@
  			LOCALUSERDIR $ORIGIN/..
  			RELATIVE_PATHES_IN_DDF 1
              STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-
 @@ -150,9 +150,9 @@
              PCPFILENAME ure.pcp
              POOLPRODUCT 0