[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - postprocess/CustomTarget_registry.mk scp2/source

[Lionel Elie Mamane]

 postprocess/CustomTarget_registry.mk |    6 +++---
 scp2/source/base/postgresqlsdbc.scp  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8682bd01aba5e04608ad1ca32b27ec06375a5b2c
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Feb 22 22:39:32 2014 +0100

    fdo#69309 rename share/registry/postgresqlsdbc.xcd to postgresql.xcd
    
    Change-Id: Ie7c9200310ab24e4d2636849b133e515f266d5c9
    Reviewed-on: https://gerrit.libreoffice.org/8183
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 064228e..afa7065 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -431,9 +431,9 @@ postprocess_FILES_xsltfilter := \
 	$(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu)
 
 ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
-postprocess_XCDS += postgresqlsdbc.xcd
-postprocess_DEPS_postgresqlsdbc := main
-postprocess_FILES_postgresqlsdbc := $(call gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
+postprocess_XCDS += postgresql.xcd
+postprocess_DEPS_postgresql := main
+postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
 postprocess_DRIVERS += postgresql
 endif
 
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 172f7f3..d27cf43 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -46,7 +46,7 @@ End
 File gid_File_PostgresqlSdbc_Xcd
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Registry;
-    Name = "postgresqlsdbc.xcd";
+    Name = "postgresql.xcd";
     Styles = (PACKED);
 End