[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/postgresql

[René Engelhard]

 patches/postgresql/sdbc-postgresql.diff |   73 +++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 5 deletions(-)

New commits:
commit c0c372e6e2c026c17be79f69e8f6e0069c57dd82
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Mar 5 09:56:22 2010 +0100

    update PostgreSQL driver to 0.7.6a

diff --git a/patches/postgresql/sdbc-postgresql.diff b/patches/postgresql/sdbc-postgresql.diff
index f588017..a850911 100644
--- a/patches/postgresql/sdbc-postgresql.diff
+++ b/patches/postgresql/sdbc-postgresql.diff
@@ -20,14 +20,14 @@
 \ Kein Zeilenumbruch am Dateiende.
 --- /dev/null	2008-11-25 09:24:02.506388553 +0100
 +++ connectivity/source/drivers/postgresql/makefile.mk	2008-07-07 23:37:11.000000000 +0200
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,224 @@
 +#*************************************************************************
 +#
 +#   $RCSfile: makefile.mk,v $
 +#
-+#   $Revision: 1.1.2.14 $
++#   $Revision: 1.1.2.15 $
 +#
-+#   last change: $Author: jbu $ $Date: 2008/07/07 21:37:11 $
++#   last change: $Author: jbu $ $Date: 2010/02/07 12:31:34 $
 +#
 +#   The Contents of this file are made available subject to the terms of
 +#   either of the following licenses
@@ -104,7 +104,7 @@
 +
 +PQ_SDBC_MAJOR=0
 +PQ_SDBC_MINOR=7
-+PQ_SDBC_MICRO=6
++PQ_SDBC_MICRO=6a
 +.IF "$(SYSTEM_POSTGRESQL)" == "YES"
 +POSTGRESQL_MAJOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f1`
 +POSTGRESQL_MINOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f2`
@@ -217,6 +217,7 @@
 +
 +$(DLLDEST)$/$(DRIVERNAME): \
 +		$(DLLDEST)$/DataAccess.xcu \
++		$(DLLDEST)$/postgresql.xcu \
 +		$(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
 +		$(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
 +		$(DLLDEST)$/$(SHL1TARGET)$(INI_EXT)
@@ -225,7 +226,12 @@
 +			$(SHL1TARGET)$(DLLPOST) \
 +			$(SHL2TARGET)$(DLLPOST) \
 +			$(SHL1TARGET)$(INI_EXT) \
-+			DataAccess.xcu
++			DataAccess.xcu \
++			postgresql.xcu
++
++$(DLLDEST)$/postgresql.xcu : postgresql.xcu
++	-rm -f $@
++	cat postgresql.xcu > $@
 +
 +$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
 +	-rm -f $@
@@ -21851,3 +21857,60 @@
 +};
 +}
 +#endif
+Index: postgresql/postgresql.xcu
+===================================================================
+RCS file: postgresql/postgresql.xcu
+diff -N postgresql/postgresql.xcu
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ connectivity/source/drivers/postgresql/postgresql.xcu	7 Feb 2010 12:31:34 -0000	1.1.2.1
+@@ -0,0 +1,50 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--***********************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************ -->
++<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
++  <node oor:name="Installed">
++    <node oor:name="sdbc:postgresql:*" oor:op="replace">
++      <prop oor:name="Driver">
++        <value>org.openoffice.comp.connectivity.pq.Driver</value>
++      </prop>
++      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
++        <value xml:lang="en-US">postgresql</value>
++      </prop>
++      <node oor:name="Properties">
++      </node>
++      <node oor:name="Features">
++      </node>
++      <node oor:name="MetaData">
++       <node oor:name="Authentication" oor:op="replace">
++          <prop oor:name="Value" oor:type="xs:string">
++            <value>UserPassword</value>
++          </prop>
++        </node>	
++      </node>
++    </node>
++  </node>
++</oor:component-data>