? .DS_Store
Index: DataAccess.xcu
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/postgresql/Attic/DataAccess.xcu,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 DataAccess.xcu
--- DataAccess.xcu	26 Aug 2007 20:40:40 -0000	1.1.2.4
+++ DataAccess.xcu	14 Aug 2009 15:39:14 -0000
@@ -1,16 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DataAccess" oor:package="org.openoffice.Office">
- <node oor:name="UserDefinedDriverSettings">
-       <node oor:name="Postgresql Driver" oor:op="replace">
-	     <prop oor:name="DriverPageDisplayName">
-		   <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value>
-	     </prop>
-	     <prop oor:name="DriverTypeDisplayName">
-		   <value>postgresql</value>
-	     </prop>
-	     <prop oor:name="DriverDsnPrefix">
-		   <value>sdbc:postgresql:</value>
-	     </prop>
-       </node>
- </node>
-</oor:node>
\ No newline at end of file
+<!--***********************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: DataAccess.xcu,v $
+ * $Revision: 1.27 $
+ *
+ * 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>com.sun.star.comp.sdbc.postgresql.Driver</value>
+      </prop>
+      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
+        <value xml:lang="en-US">Postgre SQL</value>
+      </prop>
+    </node>
+	 <node oor:name="UserDefinedDriverSettings">
+	       <node oor:name="Postgresql Driver" oor:op="replace">
+		     <prop oor:name="DriverPageDisplayName">
+			   <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value>
+		     </prop>
+		     <prop oor:name="DriverDsnPrefix">
+			   <value>sdbc:postgresql:</value>
+		     </prop>
+	       </node>
+	 </node>
+  </node>
+</oor:component-data>
Index: makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/postgresql/Attic/makefile.mk,v
retrieving revision 1.1.2.14
diff -u -r1.1.2.14 makefile.mk
--- makefile.mk	7 Jul 2008 21:37:11 -0000	1.1.2.14
+++ makefile.mk	14 Aug 2009 15:39:14 -0000
@@ -81,7 +81,7 @@
 
 PQ_SDBC_MAJOR=0
 PQ_SDBC_MINOR=7
-PQ_SDBC_MICRO=6
+PQ_SDBC_MICRO=7
 .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`
@@ -103,6 +103,7 @@
 	-DPQ_SDBC_MICRO=$(PQ_SDBC_MICRO)
 
 SHL1TARGET=postgresql-sdbc.uno
+SHL1RPATH = OXT
 LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
 LIB1OBJFILES= \
 		$(SLO)$/pq_driver.obj
@@ -121,9 +122,14 @@
 .IF "$(GUI)"=="WNT"
 PQLIB=libpq.lib wsock32.lib advapi32.lib
 .ELSE
+.IF "$(OS)" == "MACOSX"
+PQLIB=-lpq
+.ELSE
 PQLIB=-lpq -lcrypt
 .ENDIF
+.ENDIF
 SHL2TARGET=postgresql-sdbc-impl.uno
+SHL2RPATH = OXT
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES= \
 		$(SLO)$/pq_connection.obj \