Collabora Office EULA

Conflicts:
	readlicense_oo/Package_files.mk

Change-Id: Ia380db465f5094216cb36526f6cc178043376356

instsetoo_native/util/openoffice.lst.in

@@ -9,7 +9,7 @@ Globals
             REFERENCEOOOMAJORMINOR 4.1
             WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
             UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
-            HIDELICENSEDIALOG 1
+            HIDELICENSEDIALOG 0
             PACKAGEPREFIX
             BASISPACKAGEPREFIX libobasis
             UREPACKAGEPREFIX libreoffice

readlicense_oo/Package_files.mk

@@ -17,11 +17,15 @@ endif
 
 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,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
 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/LICENSE.fodt,LICENSE.fodt))
 $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
 $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))

scp2/source/ooo/common_brand.scp

@@ -1274,6 +1274,19 @@ File gid_License_Txt
     Styles = (PACKED);
 End
 
+File gid_Eula_Odt
+    BIN_FILE_BODY;
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
+    Dir = gid_Dir_Bundle_Contents;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "EULA.odt";
+    Styles = (PACKED);
+End
+
 File gid_License_Odt
     TXT_FILE_BODY;
 #if defined MACOSX

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);