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

[Tor Lillqvist]

 patches/dev300/novell-win32-installer-branding.diff |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 70d94421dd7dcf06136fd4a30504dc5266b3709a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 12 13:20:39 2011 +0200

    Make novell-win32-installer-branding.diff apply again

diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 9a423e0..ea7ec8e 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -11,22 +11,26 @@
  en-US = "&Next >"
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
-@@ -372,10 +372,16 @@
-     $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+@@ -372,11 +372,19 @@
+     $(RM) $(MSIHELPPACKTEMPLATEDIR)$/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 $(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$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 +    $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++    $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
 +    $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
 +    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++    $(RM) $(MSIHELPPACKTEMPLATEDIR)$/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 $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp