------------------------------------------------------------
revno: 2197
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-11-16 20:33:41 +0100
message:
update PostgreSQL driver to 0.7.6b, needing for OOo/LibO 3.3 support
added:
patches/postgresql-sdbc-0-7-6-b.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-11-16 19:32:00 +0000
+++ b/changelog 2010-11-16 19:33:41 +0000
@@ -1,11 +1,14 @@
libreoffice (1:3.3.0~beta3-2) UNRELEASED; urgency=low
+ * debian/patches/postgresql-sdbc-0-7-6-b.diff: update PostgreSQL driver
+ to 0.7.6b, needing for OOo/LibO 3.3 support
+
* debian/rules: actually install debian-presentation.odp to -common...
(really closes: #602043)
* debian/rules: add support to build with libwpd 0.9.x(libwp{s,g} 0.2.0.
Will be the only option from next version on anyway...
- -- Rene Engelhard <r...@debian.org> Tue, 16 Nov 2010 20:28:08 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 16 Nov 2010 20:33:01 +0100
libreoffice (1:3.3.0~beta3-1) experimental; urgency=low
=== added file 'patches/postgresql-sdbc-0-7-6-b.diff'
--- a/patches/postgresql-sdbc-0-7-6-b.diff 1970-01-01 00:00:00 +0000
+++ b/patches/postgresql-sdbc-0-7-6-b.diff 2010-11-16 19:33:41 +0000
@@ -0,0 +1,98 @@
+diff --git a/patches/postgresql/sdbc-postgresql.diff
b/patches/postgresql/sdbc-postgresql.diff
+index f60fb4e..0b978e3 100644
+---
libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/postgresql/sdbc-postgresql.diff
++++
libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/postgresql/sdbc-postgresql.diff
+@@ -1,6 +1,5 @@
+ ---
+- .../source/drivers/postgresql/DataAccess.xcu | 16 +
+- connectivity/source/drivers/postgresql/makefile.mk | 224 ++
++ connectivity/source/drivers/postgresql/makefile.mk | 214 ++
+ .../source/drivers/postgresql/postgresql-sdbc.uno | 2 +
+ .../source/drivers/postgresql/postgresql.xcu | 50 +
+ .../source/drivers/postgresql/pq_allocator.hxx | 225 ++
+@@ -70,8 +69,7 @@
+ .../source/drivers/postgresql/pq_xview.hxx | 133 ++
+ .../source/drivers/postgresql/pq_xviews.cxx | 304 +++
+ .../source/drivers/postgresql/pq_xviews.hxx | 118 ++
+- 71 files changed, 21690 insertions(+), 0 deletions(-)
+- create mode 100644 connectivity/source/drivers/postgresql/DataAccess.xcu
++ 70 files changed, 21664 insertions(+), 0 deletions(-)
+ create mode 100644 connectivity/source/drivers/postgresql/makefile.mk
+ create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno
+ create mode 100644 connectivity/source/drivers/postgresql/postgresql.xcu
+@@ -143,35 +141,12 @@
+ create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.cxx
+ create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.hxx
+
+-diff --git connectivity/source/drivers/postgresql/DataAccess.xcu
connectivity/source/drivers/postgresql/DataAccess.xcu
+-new file mode 100644
+-index 0000000..6553971
+---- /dev/null
+-+++ connectivity/source/drivers/postgresql/DataAccess.xcu
+-@@ -0,0 +1,16 @@
+-+<?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
+ diff --git connectivity/source/drivers/postgresql/makefile.mk
connectivity/source/drivers/postgresql/makefile.mk
+ new file mode 100644
+ index 0000000..1afe9c1
+ --- /dev/null
+ +++ connectivity/source/drivers/postgresql/makefile.mk
+-@@ -0,0 +1,224 @@
++@@ -0,0 +1,214 @@
+ +#*************************************************************************
+ +#
+ +# $RCSfile: makefile.mk,v $
+@@ -255,7 +230,7 @@ index 0000000..1afe9c1
+ +
+ +PQ_SDBC_MAJOR=0
+ +PQ_SDBC_MINOR=7
+-+PQ_SDBC_MICRO=6a
+++PQ_SDBC_MICRO=6b
+ +.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`
+@@ -367,7 +342,6 @@ index 0000000..1afe9c1
+ +
+ +
+ +$(DLLDEST)$/$(DRIVERNAME): \
+-+ $(DLLDEST)$/DataAccess.xcu \
+ + $(DLLDEST)$/postgresql.xcu \
+ + $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
+ + $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
+@@ -377,21 +351,12 @@ index 0000000..1afe9c1
+ + $(SHL1TARGET)$(DLLPOST) \
+ + $(SHL2TARGET)$(DLLPOST) \
+ + $(SHL1TARGET)$(INI_EXT) \
+-+ DataAccess.xcu \
+ + postgresql.xcu
+ +
+ +$(DLLDEST)$/postgresql.xcu : postgresql.xcu
+ + -rm -f $@
+ + cat postgresql.xcu > $@
+ +
+-+$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
+-+ -rm -f $@
+-+ cat DataAccess.xcu | \
+-+ sed s/PQ_SDBC_MAJOR/$(PQ_SDBC_MAJOR)/ | \
+-+ sed s/PQ_SDBC_MINOR/$(PQ_SDBC_MINOR)/ | \
+-+ sed s/PQ_SDBC_MICRO/$(PQ_SDBC_MICRO)/ > $@
+-+
+-+
+ +strip :
+ +.IF "$(GUI)"!="WNT"
+ + strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST)
$(DLLDEST)$/$(SHL2TARGET)$(DLLPOST)
=== modified file 'patches/series'
--- a/patches/series 2010-11-14 22:49:48 +0000
+++ b/patches/series 2010-11-16 19:33:41 +0000
@@ -2,3 +2,4 @@
splash-progressbarcolor.diff
buildfix-patches.diff
hack-no-rm-fr-of-smoketest-userconfig.diff
+postgresql-sdbc-0-7-6-b.diff
