diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-10-29 05:23:31 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-10-29 13:17:33 -0700 |
| commit | c1e7fe6c88f51e49201e12942aa1a71ad9cc7de4 (patch) | |
| tree | bc2a2eb1dc90264b2dcbc47d8f0f890468c2a098 | |
| parent | 7fa9194f4030902b34a3a81f7ca27a80507d5c37 (diff) | |
add Collabora EULA
Change-Id: I38f0a87398fba79e03b3e4e85b3c89aff95218bb
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 | ||||
| -rw-r--r-- | readlicense_oo/Package_files.mk | 1 | ||||
| -rw-r--r-- | readlicense_oo/odt/EULA.odt | bin | 0 -> 22553 bytes | |||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 22 |
4 files changed, 20 insertions, 7 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 034aedb39240..e750e976c2cc 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -9,7 +9,7 @@ Globals REFERENCEOOOMAJORMINOR 3.4 WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@ UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - HIDELICENSEDIALOG 1 + HIDELICENSEDIALOG 0 PACKAGEPREFIX BASISPACKAGEPREFIX libobasis UREPACKAGEPREFIX libreoffice @@ -29,7 +29,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 8 + WINDOWSPATCHLEVEL 1 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index f3f146b7f7a2..b084634d0575 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/ure/LICENSE,txt/licen $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE)) $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/LICENSE.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/EULA.odt,odt/EULA.odt)) $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt)) $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt)) diff --git a/readlicense_oo/odt/EULA.odt b/readlicense_oo/odt/EULA.odt Binary files differnew file mode 100644 index 000000000000..1cb8bf5a3ba5 --- /dev/null +++ b/readlicense_oo/odt/EULA.odt diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index ec8d082ea78c..7047875bf594 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -61,7 +61,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Libxml2, gid_Brand_File_Bmp_IntroAboutShell, gid_Brand_File_Bmp_IntroAboutShell_custom, - gid_Brand_File_Desktophelper_Txt, + gid_Brand_File_Desktophelper_Txt, gid_Brand_File_Html_Thirdpartylicensereadme, gid_Brand_File_Lib_Dbghelp, gid_Brand_File_Lib_Mingw_GccS, @@ -84,10 +84,11 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Writer, gid_Brand_File_Share_Xdg_XsltFilter, gid_Brand_File_Txt_Package, - gid_License_Txt, - git_License_Odt, - gid_Credits_Odt, - gid_Apache_Notice); + gid_License_Txt, + git_License_Odt, + gid_Eula_Odt, + gid_Credits_Odt, + gid_Apache_Notice); Unixlinks = (gid_Brand_Unixlink_Program, gid_Brand_Unixlink_Unopkg, gid_Brand_Unixlink_Urelibs); @@ -1406,6 +1407,17 @@ File gid_License_Odt Styles = (PACKED); End +File gid_Eula_Odt + BIN_FILE_BODY; +#if defined MACOSX + Dir = gid_Dir_Bundle_Contents; +#else + Dir = gid_Dir_Brand_Root; +#endif + Name = "EULA.odt"; + Styles = (PACKED); +End + File gid_Credits_Odt BIN_FILE_BODY; #if defined MACOSX |