[Libreoffice-commits] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                |    3 ---
 patches/dev300/novell-win32-installer-branding.diff |   17 +++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 4f24220e479d759dd187dd2e7ee3bb01b1655d7e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 8 12:47:43 2010 +0300

    msitrans-problemchecksum.diff seems to be in the repo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 536caec..dea98fa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -971,9 +971,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
 
-# This enables building multi language installsets with new (Windows SDK) problematic msitrans.exe
-msitrans-problemchecksum.diff, kami
-
 [ GentooOnly ]
 SectionOwner => aprosky
 
commit 13c2d65bcfa87bd56980da396edfe548e299de82
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 8 12:46:20 2010 +0300

    Massage novell-win32-installer-branding.diff to apply

diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 4fbf355..c93b7f8 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -11,14 +11,14 @@
  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
+@@ -372,10 +372,16 @@
+     $(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
@@ -30,6 +30,7 @@
 +    $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
 +    $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
  
+ .IF "$(OS)" == "WNT"
  
 --- instsetoo_native/util/openoffice.lst
 +++ instsetoo_native/util/openoffice.lst