diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-24 00:03:01 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus@libreoffice.org> | 2016-12-24 08:10:08 +0000 |
| commit | 120a87a36e04b01c99c3544aca57faf66934d9c7 (patch) | |
| tree | 536ecdf6ce80a8295242b89294e6acbe6646634a | |
| parent | 5662817149e3eed0a592c389042d9c3755629614 (diff) | |
tdf#90753: AutoInstall xpdfimport_err.pdf as filelist
Change-Id: Icfebcbf3cb738cb376a5ee97cd21a27a25c0bf35
Reviewed-on: https://gerrit.libreoffice.org/32396
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
| -rw-r--r-- | Repository.mk | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/module_pdfimport.scp | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index 6423202c4d39..884a30913558 100644 --- a/Repository.mk +++ b/Repository.mk @@ -794,7 +794,6 @@ $(eval $(call gb_Helper_register_packages, \ postprocess_registry \ python_zipcore \ readlicense_oo_readmes \ - sdext_pdfimport_pdf \ setup_native_misc \ share \ shell_senddoc \ @@ -937,6 +936,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\ slideshow_opengl_shader \ )) +ifneq ($(ENABLE_PDFIMPORT),) +$(eval $(call gb_Helper_register_packages_for_install,pdfimport, \ + sdext_pdfimport_pdf \ +)) +endif + $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\ reportbuilder-templates \ )) diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index 5159b1986d19..548ea587a70c 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -34,7 +34,6 @@ Module gid_Module_Pdfimport Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Share_Xpdfimport); Files = (auto_pdfimport_ALL, - gid_File_Dat_XpdfimportErrPdf, gid_File_Xcd_Pdfimport); End @@ -43,13 +42,6 @@ Directory gid_Dir_Share_Xpdfimport DosName = "xpdfimport"; End -File gid_File_Dat_XpdfimportErrPdf - TXT_FILE_BODY; - Dir = gid_Dir_Share_Xpdfimport; - Name = "xpdfimport_err.pdf"; - Styles = (PACKED); -End - File gid_File_Xcd_Pdfimport TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Registry; |