configure.ac | 2 +- instsetoo_native/util/openoffice.lst.in | 14 +++++++------- readlicense_oo/Package_files.mk | 3 +++ readlicense_oo/odt/EULA.odt |binary scp2/source/ooo/common_brand.scp | 22 +++++++++++++++++----- solenv/bin/modules/installer/windows/idtglobal.pm | 3 +-- 6 files changed, 29 insertions(+), 15 deletions(-)
New commits: commit 34f6b1233a996886ca2cc15ab0d66146ca5b4c96 Author: Andras Timar <[email protected]> Date: Tue Oct 29 13:12:32 2013 -0700 Collabora EULA integration to 4.1 build system Change-Id: I0c5bf15762a67dc629b35c7d07a90c87e722a20d diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index b084634..466b6fb 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -23,4 +23,6 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDI $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/EULA_en-US.rtf,eula/EULA_en-US.rtf)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 8cbfcb2..d3f3251 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -813,10 +813,9 @@ sub get_rtflicensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "license_" . $language . ".rtf"; + my $licensefilename = "EULA_en-US.rtf"; my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1); - if ($$sourcefileref eq "") { installer::exiter::exit_program("ERROR: Could not find $licensefilename!", "get_rtflicensefilesource"); } my $infoline = "Using licensefile: $$sourcefileref\n"; commit 7fea21dc92e9c187c83850b8da1470c164813dbd Author: Andras Timar <[email protected]> Date: Tue Oct 29 08:31:22 2013 -0700 Collabora versioning Change-Id: I4cb50e83084ecf5a8322260dd64650510bd286c4 major: 4, minor: 1, obviously micro: 10, higher than any TDF builds, so we rule patch: 1, it will be bumped for PTF releases diff --git a/configure.ac b/configure.ac index 4084f3a..5670c1e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.10.1],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index e750e97..8083d56 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -4,7 +4,7 @@ Globals { variables { - UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@ @@ -29,7 +29,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 1 + WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -46,13 +46,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@ - ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ + ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@-@LIBO_VERSION_PATCH@ + ABOUTBOXPRODUCTVERSIONSUFFIX BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -61,7 +61,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Oox commit c1e7fe6c88f51e49201e12942aa1a71ad9cc7de4 Author: Andras Timar <[email protected]> Date: Tue Oct 29 05:23:31 2013 -0700 add Collabora EULA Change-Id: I38f0a87398fba79e03b3e4e85b3c89aff95218bb diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 034aedb..e750e97 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 f3f146b..b084634 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 new file mode 100644 index 0000000..1cb8bf5 Binary files /dev/null and b/readlicense_oo/odt/EULA.odt differ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index ec8d082..7047875 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
