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

[Matúš Kukan]

 Repository.mk                       |    5 ++++-
 scp2/source/base/postgresqlsdbc.scp |    8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 5662817149e3eed0a592c389042d9c3755629614
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Dec 23 21:31:18 2016 +0100

    tdf#90753: AutoInstall postgresql-sdbc.ini as filelist
    
    Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb
    Reviewed-on: https://gerrit.libreoffice.org/32394
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Matúš Kukan <matus at libreoffice.org>

diff --git a/Repository.mk b/Repository.mk
index dcfa393..6423202 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -773,7 +773,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
 	test_unittest \
 	cli_basetypes_copy \
-	$(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
 	$(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
 	desktop_install \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
@@ -821,6 +820,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 	) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+	$(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_share_readme \
 	odk_share_readme_generated \
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 23bbd44..94e6936 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -18,20 +18,12 @@ Module gid_Module_Optional_PostgresqlSdbc
     MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
     ParentID = gid_Module_Prg_Base_Bin;
     Files = (auto_postgresqlsdbc_ALL,
-             gid_File_PostgresqlSdbc_Ini,
              gid_File_PostgresqlSdbc_Rdb,
              gid_File_PostgresqlSdbc_Xcd);
     Default = YES;
     Styles = ();
 End
 
-File gid_File_PostgresqlSdbc_Ini
-    TXT_FILE_BODY;
-    Dir = GID_BRAND_DIR_ETC;
-    Name = "postgresql-sdbc.ini";
-    Styles = (PACKED);
-End
-
 File gid_File_PostgresqlSdbc_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;