strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#90753: AutoInstall readlicense_oo packages

Browse source 
Change-Id: I5bd3a5f6168b20c925f5713085fcb0918bcccc8e
This commit is contained in:
Matúš Kukan 2016-12-02 11:31:50 +01:00
parent 67398a8d97
commit 6de5cf050c
2 changed files with 3 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Repository.mk
View file

@ -909,6 +909,8 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
readlicense_oo_files \
$(if $(filter WNT,$(OS)),readlicense_oo_license) \
$(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \
))

67
scp2/source/ooo/common_brand.scp
View file

@ -58,7 +58,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Gdb_Trace,
gid_Brand_File_Bin_Unoinfo,
gid_Brand_File_Desktophelper_Txt,
gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS,
gid_Brand_File_Lib_Mingw_Stdcpp,
@ -77,11 +76,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Share_Xdg_XsltFilter,
gid_License_Txt,
git_License_Odt,
gid_Credits_Odt,
gid_Apache_Notice);
gid_Brand_File_Share_Xdg_XsltFilter);
End
// Language specific brand module
@ -469,17 +464,6 @@ End
// Files
File gid_Brand_File_Html_Thirdpartylicensereadme
Name = "LICENSE.html";
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
Dir = gid_Dir_Brand_Root;
#endif
Styles = (WORKSTATION);
TXT_FILE_BODY;
End
#if defined UNX && !defined MACOSX
File gid_Brand_File_Gdb_Trace
@ -1231,52 +1215,3 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
Styles = (INIFILETABLE);
End
#endif
File gid_License_Txt
TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
Dir = gid_Dir_Brand_Root;
#endif
#ifdef UNX
Name = "LICENSE";
#endif
#ifdef WNT
Name = "license.txt";
#endif
Styles = (PACKED);
End
File gid_License_Odt
TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
Dir = gid_Dir_Brand_Root;
#endif
Name = "LICENSE.fodt";
Styles = (PACKED);
End
File gid_Credits_Odt
TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
Dir = gid_Dir_Brand_Root;
#endif
Name = "CREDITS.fodt";
Styles = (PACKED);
End
File gid_Apache_Notice
TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
Dir = gid_Dir_Brand_Root;
#endif
Name = "NOTICE";
Styles = (PACKED);
End