[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk                        |    7 ++++++-
 scp2/source/ooo/module_pdfimport.scp |    8 --------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 120a87a36e04b01c99c3544aca57faf66934d9c7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Dec 24 00:03:01 2016 +0100

    tdf#90753: AutoInstall xpdfimport_err.pdf as filelist
    
    Change-Id: Icfebcbf3cb738cb376a5ee97cd21a27a25c0bf35
    Reviewed-on: https://gerrit.libreoffice.org/32396
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Matúš Kukan <matus at libreoffice.org>

diff --git a/Repository.mk b/Repository.mk
index 6423202..884a309 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 5159b19..548ea58 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;