[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 5 commits - configure.ac extensions/source instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util postprocess/CustomTarget_registry.mk readlicense_oo/license readlicense_oo/Package_files.mk solenv/bin
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 4 08:56:11 UTC 2020
configure.ac | 2
extensions/source/macosx/spotlight/mdimporter/Info.plist | 4
instsetoo_native/CustomTarget_install.mk | 4
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 8
instsetoo_native/util/openoffice.lst.in | 14 -
postprocess/CustomTarget_registry.mk | 2
readlicense_oo/Package_files.mk | 4
readlicense_oo/license/EULA.odt |binary
readlicense_oo/license/EULA_en-US.rtf | 94 ++++++++++
solenv/bin/modules/installer/windows/idtglobal.pm | 2
12 files changed, 124 insertions(+), 26 deletions(-)
New commits:
commit 5f181dd7625d86aeba7ef56519d7059218a61d34
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jun 21 14:41:22 2015 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 4 10:40:12 2020 +0200
[cp] ERROR ITMS-90511: CFBundleIdentifier Collision
(cherry picked from commit 5c70145805eb3bc4968f1aed8695fdc4468705ab)
(cherry picked from commit 345e3c7843e1cae01080548568fb6eaa6930a2b9)
Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1
diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist b/extensions/source/macosx/spotlight/mdimporter/Info.plist
index 5a60493cb455..ab007aff37c0 100644
--- a/extensions/source/macosx/spotlight/mdimporter/Info.plist
+++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist
@@ -59,7 +59,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>org.libreoffice.mdimporter</string>
+ <string>com.collaboraoffice.mdimporter</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
@@ -82,6 +82,6 @@
</dict>
<key>CFPlugInUnloadFunction</key>
<string></string>
-
+
</dict>
</plist>
commit 7d296ccb698f32932c2ecbf117e6f5516fec8d84
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jun 3 11:29:52 2014 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 4 10:39:43 2020 +0200
[cp] Multilingual Mac OS X DMG for Collabora
(cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)
(cherry picked from commit 32e13ccac64777722a96df47aca868e263db94cd)
(cherry picked from commit 229a7cdac952bbea8263bb24b93a2456fc1a1b51)
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index ab620d5844ed..ce311e0368eb 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -116,7 +116,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif
else # LIBO_TEST_INSTALL
- $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
+ $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
endif
@@ -124,7 +124,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
$(foreach lang,$(gb_HELP_LANGS),\
$(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
endif
-ifneq (WNT,$(OS))
+ifeq (,$(filter WNT MACOSX,$(OS)))
$(foreach lang,$(instsetoo_native_WITH_LANG),\
$(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
endif
commit 482bd8f7f14600ac7b509b936f0610452c6bbeff
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Apr 18 02:16:38 2014 -0700
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 4 10:38:47 2020 +0200
[cp] Collabora Office EULA
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index efaa9a9c452f..5d97f38b6f8c 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -10,7 +10,7 @@ Globals
REFERENCEOOOMAJORMINOR 4.1
WINDOWSBASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
- HIDELICENSEDIALOG 1
+ HIDELICENSEDIALOG 0
PACKAGEPREFIX
BASISPACKAGEPREFIX libobasis
UREPACKAGEPREFIX libreoffice
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 101d3878de3f..95614109e3d1 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -11,9 +11,13 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/l
ifneq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
else
$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf))
$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
endif
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
new file mode 100644
index 000000000000..6f888e981b3a
Binary files /dev/null and b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf b/readlicense_oo/license/EULA_en-US.rtf
new file mode 100644
index 000000000000..505a644fb905
--- /dev/null
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -0,0 +1,94 @@
+{\rtf1\ansi\ansicpg1250\deff0\deflang1038{\fonttbl{\f0\fnil\fprq8\fcharset0 Arial, Arial;}{\f1\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;\red51\green51\blue51;}
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\qj\cf1\lang1169\b\f0\fs28 End User License and Subscription Agreement\par
+\pard\qj Collabora Office (\ldblquote Software\rdblquote )\par
+\cf0\b0\f1\fs22\par
+\par
+\cf1\b\f0\fs20 An individual acting on their own behalf or on behalf of any corporate entity which employs them or which they represent (\ldblquote an Organisation\rdblquote ) represents that he or she has the authority to enter into this agreement on behalf of that Organisation. In this Licence Agreement, \ldblquote You\rdblquote includes both the reader and any Organisation.\par
+\cf0\b0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE READ AND UNDERSTAND THIS AGREEMENT. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \par
+\cf0\f1\fs22\par
+\pard\qj\cf1\b\f0\fs20 PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at Kett House, Station Road, Cambridge, CB1 2JH, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 SOFTWARE\b0 . The Software and each of its components are owned by Collabora or other licensors and are protected as copyrighted works of authorship, and are also protected under applicable database and other applicable laws. To the extent that they are not accompanied by a separate Collabora software licence agreement, any modification, update or upgrade to the Software that You may download or receive, whether as Subscription Services detailed below or otherwise, is included as Software and governed by the \ldblquote Licenses\rdblquote heading below and generally by this Agreement.\par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 LICENCES.\b0 Provided that You have subscribed to the Subscription Services as detailed below and Your compliance with the other terms and conditions of this Agreement, Collabora grants to You a perpetual, non-transferable, worldwide licence (\ldblquote Licence\rdblquote ) to reproduce and use copies of the Software within Your Organization. The Software is licensed (not sold) to You. Accordingly no title to or ownership of the Software is transferred to You. You should also be aware that in addition to this grant of Licence, many of the individual components of the Software are subject to open source licences, as detailed further below under \ldblquote Open Source Licences and Limitations\rdblquote .\par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 SUBSCRIPTION SERVICES. \b0 The Licence to reproduce and use a copy of the Software is granted subject to the initial purchase by You of Software maintenance and/or support services entitlements (\ldblquote Subscription Services Entitlements\rdblquote ) equivalent in number to the total number of units of the Software that you intend to deploy, install or use in Your Organization.\par
+\pard\qj The Subscription Services Entitlements entitle You during the subscription period to make use of the following services (\ldblquote Subscription Services\rdblquote ):\par
+a) in the case of maintenance services, to any security fixes and Software updates which may be issued by Collabora, including existing fixes from the support services set out at (b), on the terms set out in this Agreement and from time to time at \cf0{\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f1\fs22\par
+\cf1\f0\fs20 b) in the case of support services, to fee based technical support on the terms set out in this Agreement, or any separate agreement, and from time to time at \cf0{\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\cf1\f0\fs20 . \par
+All Subscription Services will be supplied in a professional manner in accordance with generally accepted industry standards. \par
+Unless the Subscription Services and Subscription Services Entitlements are set out in a separate contract with Collabora, they are offered to You subject to the terms set out in this Agreement. \par
+\cf0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME.\par
+\pard\qj\tx5693\tab\par
+\pard\qj\fs24 HOME USE.\fs20 Collabora grants primary users of Subscription Services Entitlements and their immediate family members a License to reproduce and use copies of the Software for Home Use as detailed below unless otherwise prohibited by any applicable laws, policies or regulations. Home Use is usage outside the scope of normal business that occurs primarily inside the home.\par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 LICENSE COMPLIANCE AUDIT\b0 . Collabora may, upon fifteen (15) days\rquote advance notice and at its expense, conduct an annual audit if You are an Organisation, during your normal business hours, of Your use of the Software to verify compliance with this Agreement and in particular Your commitment under the License herein to purchase an equivalent number units of Subscription Services Entitlements. You agree to keep records sufficient to certify your compliance with this Agreement. Upon Collabora\rquote s or its authorized representative\rquote s reasonable written commitment(s) to safeguard your confidential information, you shall fully cooperate with such audit and provide any necessary assistance and access to records and computers. If an audit reveals that you have or at any time had unlicensed installation, use of, or access to the Software, You will promptly acquire sufficient Subscription Services Entitlements to cover any shortage. If a shortage of 5% or mor
e is found, you must reimburse Collabora for the costs incurred in the audit and acquire the necessary additional Subscription Services Entitlements within 30 days. \par
+\cf0\f1\fs22\par
+\cf3\b\f0\fs20 EVALUATION LICENCE.\b0 An evaluation licence is granted when You deploy, install or use an evaluation version of the Software or You are granted a time limited, non-exclusive and non-transferable licence by Collabora for evaluation purposes. The Software is licensed to You for the sole purpose of evaluating the Software and only for a specified evaluation period of 30 days. After 30 days You must either purchase an equivalent Subscription Services Entitlement from Collabora, or destroy and stop using the Software. If You purchase the Subscription Service Entitlement before the expiration of the evaluation time, You have a valid licence and You do not need to destroy the Software. \par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 OPEN SOURCE LICENCES/LIMITATIONS.\b0 The individual components included in the Software are licensed primarily pursuant to Mozilla Public License v2.0 open source licence in addition to other open source licences identified in the documentation or located in the source code or binary code for the component. As such the source code form of the Software is made available at all times under the terms of such licences. \par
+\pard\qj Whilst this Agreement in no way limits Your rights under such licences, nor is intended to supersede or conflict with the licence terms or obligations for use of any individual open source component, the Mozilla Public License v2.0 has been utilised to license the majority of the components comprising the Software because it imposes (as is set out in paragraph 3.2(b) of it) specific conditions on the free distribution of such software in its executable form. \par
+\b \par
+MAINTENANCE SERVICES. \par
+\b0 1) By purchasing maintenance services You are entitled to install and use all upgrades and updates made commercially available by Collabora during the period covered by the maintenance services subscription, up to the number of installations for which You have purchase maintenance services. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 2) Any \ldblquote update\rdblquote means a fix or compilation of fixes released by Collabora to correct operational errors (a defect that prevents it from operating substantially as intended, where such intent shall be deduced based on a competent inspection of the source code and documentation) in the Software. An \ldblquote upgrade\rdblquote means any new version of the Software which bears the same product name, including version changes evidenced by a number immediately after the name of the Software. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 3) If a question arises as to whether a release by Collabora is an upgrade or an update or a new Software product, Collabora\rquote s opinion will prevail provided that Collabora treats the product offering the same for its end users generally.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 4) If Collabora commercially releases any upgrade or updates, it will make such upgrades or updates available to You within a reasonable period of time after they become commercially available, although Collabora cannot guarantee any specific turnaround times and/or regular release intervals. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 5) At its sole discretion Collabora will determine whether to eliminate an operational error by means of issuing an update. Collabora will inform you by email (to the address given on registration of the maintenance services) as soon as new updates are released at the Collabora website.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 6) Maintenance services do not include integration services, installation of upgrades or updates, support services or any other benefits not expressly described in this Agreement.\par
+\cf0\f1\fs22\par
+\cf1\b\f0\fs20 SUPPORT SERVICES\par
+\pard\sa120\sl276\slmult1\cf0\b0 By purchasing an entitlement to \lquote Level 3\rquote technical support services will be provided on certain terms which include:\par
+- allocation of a severity level for each support case and any variations on this;\par
+- Collabora\rquote s work availability times, initial response time and the communication frequency for each support case based on such allocated case severity level; \par
+- Your limit on the number of support cases that You can report for each such allocated case severity level (although for the avoidance of doubt, any unused limit cannot be refunded and expires at the end of the Subscription Services Entitlement period unless otherwise agreed). \par
+\pard\sa120\sl276\slmult1 The specific terms are subject to change from time to time and accordingly are set out at {\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f0\fs20 , unless separately agreed with You such as in a purchase order. You are urged to check these terms again now before proceeding with any purchase of Subscription Services Entitlements. \par
+Alternatively, Collabora also entitle You to purchase the support services entitlement from a reseller or other intermediary rather than from Collabora directly. If You have purchased the services entitlement from such a party please check with them if any support service entitlement terms have been separately negotiated between them and Collabora, as any such terms are deemed to be incorporated into this Agreement and shall take precedence over any conflicting terms set out at {\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f0\fs20 or on a purchase order.\par
+\pard\qj\cf1\b LIMITATIONS AND EXCLUSIONS\par
+\b0 1) Collabora offers no rights other than those expressly granted to You in this Agreement. Except as agreed to under a separate written agreement with Collabora or in the licence terms accompanying a particular component, to the maximum extent permitted under applicable law (and not applicable to claims relating to death or personal injury caused by negligence or fraudulent misrepresentation) the Software is provided and licensed "as is" without any warranties of any kind, express or implied, including any implied warranties of quality, title, non-infringement, non-interruption or fitness for a particular purpose. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 2) The Software is only compatible with certain computers and operating systems. It is not warranted for non-compatible systems or for incorrect or unauthorised use, being use which is not in accordance with the Documentation. Please contact Collabora for information about compatibility or incorrect use. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 3) The Software may include or be bundled with other software programmes or services licensed or sold by an entity other than Collabora. Collabora does not warrant non-Collabora products or services, which are provided on an "as is" basis. Please see the third party entity regarding remedies.\par
+\cf0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 4) No right or licence, express or implied, is granted under this Agreement with respect to any trademark, trade name or service mark (\ldblquote Mark\rdblquote ) of Collabora. If You distribute any open source component of the Software, You must remove all Marks except those used to identify Collabora\rquote s ownership or licensing of the component. In addition you may not vary, delete or obscure any notices of proprietary rights or any product identification or restrictions on or in the Software.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 5) Neither Collabora nor any of its licensors, subsidiaries, contractors or employees will in any case be liable for any incidental, consequential, indirect or economic damages arising out of the use of or inability to use the Software or Subscription Services, including without limitation loss of profits, business or data, even if advised of the possibility of those damages. In particular, as files may be altered or damaged in the course of Collabora providing Subscription Services, You agree to take appropriate measures to isolate and back up Your systems. \par
+\cf0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 6) Notwithstanding (5) above, in no event will Collabora's aggregate liability for damages (whether in one instance or a series of instances) exceed 1.25 times the amount paid by You for the Subscription Services Entitlements out of which such claim arose.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 7) Upon any default in Collabora\rquote s provision of Subscription Services, Collabora's only obligation is to either correct the Subscription Services so that they comply with this warranty or at its option refund the amount You paid to Collabora for the portion of such Services that fail to comply with this warranty and in such event You may elect to terminate this Agreement with immediate effect.\par
+\cf0\f1\fs22\par
+\par
+\cf1\b\f0\fs20 GENERAL TERMS\par
+\b0 1) This Agreement may not be transferred or assigned without the prior written approval of Collabora.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 2) This Agreement will terminate if You fail to comply with any term or condition of this Agreement.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 3) Unless explicitly indicated otherwise, this Agreement sets forth the entire understanding and agreement between You and Collabora and may be amended or modified only by a written agreement agreed to by You and Collabora. No licensor, distributor, or reseller is authorised to modify this Agreement whether formally or informally.\par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 4) No waiver of any right under this Agreement will be effective unless in writing. No waiver of any past or present right will be deemed to be a waiver of any future right arising under this Agreement. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 5) If any provision in this Agreement is invalid or unenforceable, that provision will be construed, limited, modified or, if necessary, severed, to the extent necessary, to eliminate its invalidity or unenforceability, and the other provisions of this Agreement will remain unaffected. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 6) Any products or technical information provided under this Agreement may be subject to trade laws of various countries including U.S. export controls. Both You and Collabora each agree to comply with all export control regulations and to obtain any required licenses or classification to export, re-export or import deliverables and Collabora assumes no responsibility for the Your failure to comply with any such necessary export control laws, rules or regulations. \par
+\cf0\f1\fs22\par
+\cf1\f0\fs20 7) If You are an Organisation You agree that you will not use the Software in breach of any relevant laws in the country in which you use the Software, and you agree to implement internal safeguards to prevent any unauthorized copying, distribution, installation, or use of, or access to, the Software.\par
+\cf0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 8) You may make a reasonable number of copies\b \b0 of the Software over and above the number of units of Software for which you have purchased Subscription Services Entitlements, purely for backup, archival or other security purposes. In so doing You will not be in breach of the terms of this Agreement.\par
+\cf0\f1\fs22\par
+\pard\qj\cf1\f0\fs20 9) Without regard to conflict of laws rules and principles or the United Nations Convention of Contracts for the International Sale of Goods, this Agreement is governed by the laws of England, and any action relating to this Agreement may only be brought before the courts of England.\par
+\cf0\f1\fs22\par
+\par
+\cf1\i\f0\fs20 EULA 2014-10-20\par
+}
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 26c8e951c9c9..00c466b459e3 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -813,7 +813,7 @@ 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);
commit 9238f6ca7701da9995aac7f9ff111add87facf23
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Apr 18 02:36:57 2014 -0700
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 4 10:36:58 2020 +0200
[cp] Collabora Office ARP data
Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 9a9721b0dbb2..992b14ed7672 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense No
ApplicationUsers AllUsers
ALLUSERS 1
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT Collabora Productivity Ltd.
+ARPHELPLINK https://CollaboraOffice.com
+ARPURLINFOABOUT https://CollaboraOffice.com
+ARPURLUPDATEINFO https://CollaboraOffice.com
DefaultUIFont DialogDefault
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 03fab1ce9347..fb51fc36322b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense No
ApplicationUsers AllUsers
ALLUSERS 1
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT Collabora Productivity Ltd.
+ARPHELPLINK https://CollaboraOffice.com
+ARPURLINFOABOUT https://CollaboraOffice.com
+ARPURLUPDATEINFO https://CollaboraOffice.com
DefaultUIFont DialogDefault
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index bea6abe6af03..284b24962a26 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -6,10 +6,10 @@ _IsSetupTypeMin Typical
AgreeToLicense No
ApplicationUsers AllUsers
ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT Collabora Productivity Ltd.
+ARPHELPLINK https://CollaboraOffice.com
+ARPURLINFOABOUT https://CollaboraOffice.com
+ARPURLUPDATEINFO https://CollaboraOffice.com
ARPNOREPAIR 1
ARPNOMODIFY 1
DefaultUIFont Tahoma8
commit c2eb392669c0194c696fa9ea26c1eff20618664d
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Apr 17 09:55:57 2014 -0700
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 4 10:35:18 2020 +0200
[cp] Collabora Office versioning
Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
diff --git a/configure.ac b/configure.ac
index 3211ee370802..f6800bd2cf71 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],[6.4.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([Collabora Office],[6.4.10.1],[],[],[https://collaboraoffice.com/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 1a2fdb5540f0..efaa9a9c452f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -5,7 +5,7 @@ Globals
variables
{
LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@
- UREPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ UREPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 4.1
WINDOWSBASISROOTNAME LibreOffice
@@ -30,7 +30,7 @@ Globals
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 8
+ WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
OOODOWNLOADNAME 1
64BITPRODUCT @WINDOWS_X64@
WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
@@ -47,19 +47,19 @@ LibreOffice
{
PRODUCTNAME @PRODUCTNAME@
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
- PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PRODUCTEXTENSION - at LIBO_VERSION_PATCH@
POSTVERSIONEXTENSION
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
+ ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at -@LIBO_VERSION_PATCH@
+ ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp
UPDATEURL https://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
ADDSYSTEMINTEGRATION 1
- PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
ROOTMODULEGID gid_Module_Root
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index c33417c6b2a7..af24cedc7f79 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -551,7 +551,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l
#
postprocess_main_SED := \
- -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
+ -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH),g' \
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \
-e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst $(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
More information about the Libreoffice-commits
mailing list