diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
| commit | d856c71a7de5a89a855ab84e5c99a187675fb3e6 (patch) | |
| tree | 524da5c1452039059ff3038234eac75f63ede64b /instsetoo_native | |
| parent | 91b54d2c173401ef026f4dd6c01b5aadcd150db9 (diff) | |
| parent | 3335c0b182814ef724d425b24abe3070cb4e83dc (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
configure.in
solenv/bin/build.pl
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/res/nologobanner.bmp | bin | 0 -> 7110 bytes | |||
| -rw-r--r-- | instsetoo_native/res/nologoinstall.bmp | bin | 52242 -> 52030 bytes | |||
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 12 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 12 |
4 files changed, 17 insertions, 7 deletions
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp Binary files differnew file mode 100644 index 000000000000..3bd088711545 --- /dev/null +++ b/instsetoo_native/res/nologobanner.bmp diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp Binary files differindex 25b5b11bed20..8af9fc41f709 100644 --- a/instsetoo_native/res/nologoinstall.bmp +++ b/instsetoo_native/res/nologoinstall.bmp diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index df2515b085f0..e3db4b007777 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -190,7 +190,7 @@ $(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS) - + $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS) @@ -340,11 +340,21 @@ hack_msitemplates .PHONY: $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp + $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp + $(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 .IF "$(OS)" == "WNT" diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index dccd310e7ef2..2ab17bff20a2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -126,7 +126,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -191,7 +191,7 @@ LibreOffice_Dev PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -269,7 +269,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 LICENSENAME LGPL SERVICESPROJEKT 1 SETSTATICPATH 1 @@ -310,7 +310,7 @@ LibreOffice_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 @@ -355,7 +355,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK |
