[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-3-24-g8322848
The following commit has been merged in the debian-experimental-3.5 branch:
commit 30df50410b02f4caa806b02b8ddbb63684746cc0
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 13 17:10:37 2011 +0200
patches are actually -p1, fix them. Fix lp_solve detection. Temporary disable some patches
diff --git a/patches/add-sdbc-postgresql.diff b/patches/add-sdbc-postgresql.diff
index 277b9a1..2116fee 100644
--- a/patches/add-sdbc-postgresql.diff
+++ b/patches/add-sdbc-postgresql.diff
@@ -1,6 +1,6 @@
diff -urN configure.in configure.in
---- configure.in 2011-09-08 11:55:02.000000000 +0200
-+++ configure.in 2011-09-08 13:06:05.000000000 +0200
+--- libreoffice-3.5.0/configure.in 2011-09-08 11:55:02.000000000 +0200
++++ libreoffice-3.5.0/configure.in 2011-09-08 13:06:05.000000000 +0200
@@ -4548,6 +4548,23 @@
AC_SUBST(HSQLDB_JAR)
@@ -26,8 +26,8 @@ diff -urN configure.in configure.in
dnl ===================================================================
AC_MSG_CHECKING([which beanshell to use])
diff -urN download download
---- download 2011-09-08 11:55:26.000000000 +0200
-+++ download 2011-09-08 13:06:05.000000000 +0200
+--- libreoffice-3.5.0/download 2011-09-08 11:55:26.000000000 +0200
++++ libreoffice-3.5.0/download 2011-09-08 13:06:05.000000000 +0200
@@ -55,7 +55,7 @@
for i in $GIT_REPO_NAMES ; do
bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
@@ -38,8 +38,8 @@ diff -urN download download
done
fi
diff -urN set_soenv.in set_soenv.in
---- set_soenv.in 2011-09-08 11:55:46.000000000 +0200
-+++ set_soenv.in 2011-09-08 13:06:05.000000000 +0200
+--- libreoffice-3.5.0/set_soenv.in 2011-09-08 11:55:46.000000000 +0200
++++ libreoffice-3.5.0/set_soenv.in 2011-09-08 13:06:05.000000000 +0200
@@ -2044,6 +2044,7 @@
ToFile( "SYSTEM_REDLAND", "@SYSTEM_REDLAND@", "e" );
ToFile( "REDLAND_CFLAGS", "@REDLAND_CFLAGS@", "e" );
@@ -49,8 +49,8 @@ diff -urN set_soenv.in set_soenv.in
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
diff -urN connectivity/prj/build.lst connectivity/prj/build.lst
---- connectivity/prj/build.lst 2011-09-08 12:00:34.000000000 +0200
-+++ connectivity/prj/build.lst 2011-09-09 12:00:07.000000000 +0200
+--- libreoffice-3.5.0/connectivity/prj/build.lst 2011-09-08 12:00:34.000000000 +0200
++++ libreoffice-3.5.0/connectivity/prj/build.lst 2011-09-09 12:00:07.000000000 +0200
@@ -18,6 +18,7 @@
cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
@@ -60,13 +60,13 @@ diff -urN connectivity/prj/build.lst connectivity/prj/build.lst
cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
diff -urN connectivity/source/drivers/postgresql/description/description_en-US.txt connectivity/source/drivers/postgresql/description/description_en-US.txt
---- connectivity/source/drivers/postgresql/description/description_en-US.txt 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/description/description_en-US.txt 2011-09-09 12:01:04.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/description/description_en-US.txt 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/description/description_en-US.txt 2011-09-09 12:01:04.000000000 +0200
@@ -0,0 +1 @@
+A native PostgreSQL database driver for LibreOffice. It is faster, seamlessly integrated and there is no need to install and setup a JDBC or ODBC driver separately. Compatible with PostgreSQL version 8.4 and later.
diff -urN connectivity/source/drivers/postgresql/description.xml connectivity/source/drivers/postgresql/description.xml
---- connectivity/source/drivers/postgresql/description.xml 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/description.xml 2011-09-09 12:00:58.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/description.xml 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/description.xml 2011-09-09 12:00:58.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description xmlns="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dep="http://openoffice.org/extensions/description/2006";>
@@ -86,8 +86,8 @@ diff -urN connectivity/source/drivers/postgresql/description.xml connectivity/so
+ </extension-description>
+</description>
diff -urN connectivity/source/drivers/postgresql/makefile.mk connectivity/source/drivers/postgresql/makefile.mk
---- connectivity/source/drivers/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/makefile.mk 2011-09-09 12:01:25.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/makefile.mk 2011-09-09 12:01:25.000000000 +0200
@@ -0,0 +1,231 @@
+#*************************************************************************
+#
@@ -321,8 +321,8 @@ diff -urN connectivity/source/drivers/postgresql/makefile.mk connectivity/source
+ strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST)
+.ENDIF
diff -urN connectivity/source/drivers/postgresql/manifest.xml connectivity/source/drivers/postgresql/manifest.xml
---- connectivity/source/drivers/postgresql/manifest.xml 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/manifest.xml 2011-09-09 12:00:12.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/manifest.xml 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/manifest.xml 2011-09-09 12:00:12.000000000 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
@@ -335,14 +335,14 @@ diff -urN connectivity/source/drivers/postgresql/manifest.xml connectivity/sourc
+ manifest:full-path="postgresql.xcu"/>
+</manifest:manifest>
diff -urN connectivity/source/drivers/postgresql/postgresql-sdbc.uno connectivity/source/drivers/postgresql/postgresql-sdbc.uno
---- connectivity/source/drivers/postgresql/postgresql-sdbc.uno 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/postgresql-sdbc.uno 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/postgresql-sdbc.uno 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/postgresql-sdbc.uno 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,2 @@
+[Bootstrap]
+PQ_LOGLEVEL=NONE
diff -urN connectivity/source/drivers/postgresql/postgresql.xcu connectivity/source/drivers/postgresql/postgresql.xcu
---- connectivity/source/drivers/postgresql/postgresql.xcu 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/postgresql.xcu 2011-09-09 12:01:09.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/postgresql.xcu 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/postgresql.xcu 2011-09-09 12:01:09.000000000 +0200
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
@@ -429,8 +429,8 @@ diff -urN connectivity/source/drivers/postgresql/postgresql.xcu connectivity/sou
+<!-- indent-tabs-mode: nil -->
+<!-- End: -->
diff -urN connectivity/source/drivers/postgresql/pq_allocator.hxx connectivity/source/drivers/postgresql/pq_allocator.hxx
---- connectivity/source/drivers/postgresql/pq_allocator.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_allocator.hxx 2011-09-09 12:00:33.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_allocator.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_allocator.hxx 2011-09-09 12:00:33.000000000 +0200
@@ -0,0 +1,240 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -673,8 +673,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_allocator.hxx connectivity/s
+
+#endif /* _PQ_ALLOCATOR_ */
diff -urN connectivity/source/drivers/postgresql/pq_array.cxx connectivity/source/drivers/postgresql/pq_array.cxx
---- connectivity/source/drivers/postgresql/pq_array.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_array.cxx 2011-09-09 12:00:36.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_array.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_array.cxx 2011-09-09 12:00:36.000000000 +0200
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
@@ -774,8 +774,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_array.cxx connectivity/sourc
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_array.hxx connectivity/source/drivers/postgresql/pq_array.hxx
---- connectivity/source/drivers/postgresql/pq_array.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_array.hxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_array.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_array.hxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,130 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -908,8 +908,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_array.hxx connectivity/sourc
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.cxx connectivity/source/drivers/postgresql/pq_baseresultset.cxx
---- connectivity/source/drivers/postgresql/pq_baseresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_baseresultset.cxx 2011-09-09 12:01:13.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 2011-09-09 12:01:13.000000000 +0200
@@ -0,0 +1,746 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -1658,8 +1658,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.cxx connectivi
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.hxx connectivity/source/drivers/postgresql/pq_baseresultset.hxx
---- connectivity/source/drivers/postgresql/pq_baseresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_baseresultset.hxx 2011-09-09 12:01:05.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_baseresultset.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_baseresultset.hxx 2011-09-09 12:01:05.000000000 +0200
@@ -0,0 +1,272 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -1934,8 +1934,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.hxx connectivi
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_common.hxx connectivity/source/drivers/postgresql/pq_common.hxx
---- connectivity/source/drivers/postgresql/pq_common.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_common.hxx 2011-09-09 12:00:33.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_common.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_common.hxx 2011-09-09 12:00:33.000000000 +0200
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -1978,8 +1978,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_common.hxx connectivity/sour
+
+#endif /* _PQ_COMMON_ */
diff -urN connectivity/source/drivers/postgresql/pq_connection.cxx connectivity/source/drivers/postgresql/pq_connection.cxx
---- connectivity/source/drivers/postgresql/pq_connection.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_connection.cxx 2011-09-09 12:01:20.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_connection.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_connection.cxx 2011-09-09 12:01:20.000000000 +0200
@@ -0,0 +1,809 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -2791,8 +2791,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_connection.cxx connectivity/
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_connection.hxx connectivity/source/drivers/postgresql/pq_connection.hxx
---- connectivity/source/drivers/postgresql/pq_connection.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_connection.hxx 2011-09-09 12:01:22.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_connection.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_connection.hxx 2011-09-09 12:01:22.000000000 +0200
@@ -0,0 +1,290 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -3085,8 +3085,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_connection.hxx connectivity/
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.cxx connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
---- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 2011-09-09 12:01:22.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 2011-09-09 12:01:22.000000000 +0200
@@ -0,0 +1,2632 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -5721,8 +5721,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.cxx connect
+}
+}
diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.hxx connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
---- connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 2011-09-09 12:00:51.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 2011-09-09 12:00:51.000000000 +0200
@@ -0,0 +1,256 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -5981,8 +5981,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.hxx connect
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_driver.cxx connectivity/source/drivers/postgresql/pq_driver.cxx
---- connectivity/source/drivers/postgresql/pq_driver.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_driver.cxx 2011-09-09 12:01:12.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_driver.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_driver.cxx 2011-09-09 12:01:12.000000000 +0200
@@ -0,0 +1,408 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -6393,8 +6393,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_driver.cxx connectivity/sour
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_driver.hxx connectivity/source/drivers/postgresql/pq_driver.hxx
---- connectivity/source/drivers/postgresql/pq_driver.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_driver.hxx 2011-09-09 12:01:12.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_driver.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_driver.hxx 2011-09-09 12:01:12.000000000 +0200
@@ -0,0 +1,162 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -6559,8 +6559,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_driver.hxx connectivity/sour
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
---- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,206 @@
+#include "pq_fakedupdateableresultset.hxx"
+#include <cppuhelper/typeprovider.hxx>
@@ -6769,8 +6769,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
---- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
@@ -6906,8 +6906,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.cxx connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
---- connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,883 @@
+/*************************************************************************
+ *
@@ -7793,8 +7793,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.cxx connec
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.hxx connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
---- connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 2011-09-09 12:01:05.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 2011-09-09 12:01:05.000000000 +0200
@@ -0,0 +1,288 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -8085,8 +8085,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.hxx connec
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_resultset.cxx connectivity/source/drivers/postgresql/pq_resultset.cxx
---- connectivity/source/drivers/postgresql/pq_resultset.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_resultset.cxx 2011-09-09 12:00:39.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultset.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultset.cxx 2011-09-09 12:00:39.000000000 +0200
@@ -0,0 +1,255 @@
+#include "pq_resultset.hxx"
+#include "pq_resultsetmetadata.hxx"
@@ -8344,8 +8344,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_resultset.cxx connectivity/s
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_resultset.hxx connectivity/source/drivers/postgresql/pq_resultset.hxx
---- connectivity/source/drivers/postgresql/pq_resultset.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_resultset.hxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultset.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultset.hxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
@@ -8470,8 +8470,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_resultset.hxx connectivity/s
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
---- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 2011-09-09 12:00:47.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 2011-09-09 12:00:47.000000000 +0200
@@ -0,0 +1,527 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -9001,8 +9001,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx connec
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
---- connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -9163,8 +9163,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx connec
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
---- connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
@@ -9317,8 +9317,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx connec
+}
+}
diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
---- connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
@@ -9451,8 +9451,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx connec
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
---- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,182 @@
+#include "pq_sequenceresultsetmetadata.hxx"
+
@@ -9637,8 +9637,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cx
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
---- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 2011-09-09 12:00:01.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 2011-09-09 12:00:01.000000000 +0200
@@ -0,0 +1,53 @@
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
@@ -9694,8 +9694,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hx
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_statement.cxx connectivity/source/drivers/postgresql/pq_statement.cxx
---- connectivity/source/drivers/postgresql/pq_statement.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_statement.cxx 2011-09-09 12:00:59.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statement.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statement.cxx 2011-09-09 12:00:59.000000000 +0200
@@ -0,0 +1,1068 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -10766,8 +10766,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_statement.cxx connectivity/s
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_statement.hxx connectivity/source/drivers/postgresql/pq_statement.hxx
---- connectivity/source/drivers/postgresql/pq_statement.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_statement.hxx 2011-09-09 12:01:05.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statement.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statement.hxx 2011-09-09 12:01:05.000000000 +0200
@@ -0,0 +1,233 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -11003,8 +11003,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_statement.hxx connectivity/s
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_statics.cxx connectivity/source/drivers/postgresql/pq_statics.cxx
---- connectivity/source/drivers/postgresql/pq_statics.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_statics.cxx 2011-09-09 12:00:35.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statics.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statics.cxx 2011-09-09 12:00:35.000000000 +0200
@@ -0,0 +1,765 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -11772,8 +11772,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_statics.cxx connectivity/sou
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_statics.hxx connectivity/source/drivers/postgresql/pq_statics.hxx
---- connectivity/source/drivers/postgresql/pq_statics.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_statics.hxx 2011-09-09 12:01:22.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statics.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_statics.hxx 2011-09-09 12:01:22.000000000 +0200
@@ -0,0 +1,296 @@
+/*************************************************************************
+ *
@@ -12072,8 +12072,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_statics.hxx connectivity/sou
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_tools.cxx connectivity/source/drivers/postgresql/pq_tools.cxx
---- connectivity/source/drivers/postgresql/pq_tools.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_tools.cxx 2011-09-09 12:01:27.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_tools.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_tools.cxx 2011-09-09 12:01:27.000000000 +0200
@@ -0,0 +1,1295 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
@@ -13371,8 +13371,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_tools.cxx connectivity/sourc
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_tools.hxx connectivity/source/drivers/postgresql/pq_tools.hxx
---- connectivity/source/drivers/postgresql/pq_tools.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_tools.hxx 2011-09-09 12:01:29.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_tools.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_tools.hxx 2011-09-09 12:01:29.000000000 +0200
@@ -0,0 +1,207 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -13582,8 +13582,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_tools.hxx connectivity/sourc
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.cxx connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
---- connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 2011-09-09 12:00:59.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 2011-09-09 12:00:59.000000000 +0200
@@ -0,0 +1,557 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
@@ -14143,8 +14143,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.cxx conn
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.hxx connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
---- connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 2011-09-09 12:00:35.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 2011-09-09 12:00:35.000000000 +0200
@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
@@ -14267,8 +14267,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.hxx conn
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xbase.cxx connectivity/source/drivers/postgresql/pq_xbase.cxx
---- connectivity/source/drivers/postgresql/pq_xbase.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xbase.cxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xbase.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xbase.cxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,281 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -14552,8 +14552,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xbase.cxx connectivity/sourc
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xbase.hxx connectivity/source/drivers/postgresql/pq_xbase.hxx
---- connectivity/source/drivers/postgresql/pq_xbase.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xbase.hxx 2011-09-09 12:01:05.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xbase.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xbase.hxx 2011-09-09 12:01:05.000000000 +0200
@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -14721,8 +14721,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xbase.hxx connectivity/sourc
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.cxx connectivity/source/drivers/postgresql/pq_xcolumn.cxx
---- connectivity/source/drivers/postgresql/pq_xcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
@@ -14849,8 +14849,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.cxx connectivity/sou
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.hxx connectivity/source/drivers/postgresql/pq_xcolumn.hxx
---- connectivity/source/drivers/postgresql/pq_xcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
@@ -14961,8 +14961,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.hxx connectivity/sou
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.cxx connectivity/source/drivers/postgresql/pq_xcolumns.cxx
---- connectivity/source/drivers/postgresql/pq_xcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcolumns.cxx 2011-09-09 12:00:59.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumns.cxx 2011-09-09 12:00:59.000000000 +0200
@@ -0,0 +1,618 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -15583,8 +15583,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.cxx connectivity/so
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.hxx connectivity/source/drivers/postgresql/pq_xcolumns.hxx
---- connectivity/source/drivers/postgresql/pq_xcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcolumns.hxx 2011-09-09 12:00:59.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcolumns.hxx 2011-09-09 12:00:59.000000000 +0200
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -15736,8 +15736,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.hxx connectivity/so
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.cxx connectivity/source/drivers/postgresql/pq_xcontainer.cxx
---- connectivity/source/drivers/postgresql/pq_xcontainer.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcontainer.cxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcontainer.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcontainer.cxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,514 @@
+/*************************************************************************
+ *
@@ -16254,8 +16254,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.cxx connectivity/
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.hxx connectivity/source/drivers/postgresql/pq_xcontainer.hxx
---- connectivity/source/drivers/postgresql/pq_xcontainer.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xcontainer.hxx 2011-09-09 12:01:22.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcontainer.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xcontainer.hxx 2011-09-09 12:01:22.000000000 +0200
@@ -0,0 +1,240 @@
+/*************************************************************************
+ *
@@ -16498,8 +16498,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.hxx connectivity/
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
---- connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
@@ -16624,8 +16624,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx connectivit
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
---- connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
@@ -16737,8 +16737,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx connectivit
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
---- connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,324 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -17065,8 +17065,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx connectivi
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
---- connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 2011-09-09 12:00:37.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 2011-09-09 12:00:37.000000000 +0200
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -17217,8 +17217,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx connectivi
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xindex.cxx connectivity/source/drivers/postgresql/pq_xindex.cxx
---- connectivity/source/drivers/postgresql/pq_xindex.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindex.cxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindex.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindex.cxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,267 @@
+/*************************************************************************
+ *
@@ -17488,8 +17488,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindex.cxx connectivity/sour
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xindexes.cxx connectivity/source/drivers/postgresql/pq_xindexes.cxx
---- connectivity/source/drivers/postgresql/pq_xindexes.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexes.cxx 2011-09-09 12:00:59.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexes.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexes.cxx 2011-09-09 12:00:59.000000000 +0200
@@ -0,0 +1,355 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -17847,8 +17847,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexes.cxx connectivity/so
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xindexes.hxx connectivity/source/drivers/postgresql/pq_xindexes.hxx
---- connectivity/source/drivers/postgresql/pq_xindexes.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindexes.hxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexes.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindexes.hxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
@@ -17986,8 +17986,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindexes.hxx connectivity/so
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xindex.hxx connectivity/source/drivers/postgresql/pq_xindex.hxx
---- connectivity/source/drivers/postgresql/pq_xindex.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xindex.hxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindex.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xindex.hxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,156 @@
+/*************************************************************************
+ *
@@ -18146,8 +18146,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xindex.hxx connectivity/sour
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
---- connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
@@ -18271,8 +18271,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx connectivity/
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
---- connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
@@ -18383,8 +18383,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx connectivity/
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
---- connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,411 @@
+/*************************************************************************
+ *
@@ -18798,8 +18798,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx connectivity
+}
+};
diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
---- connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
@@ -18936,8 +18936,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx connectivity
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xkey.cxx connectivity/source/drivers/postgresql/pq_xkey.cxx
---- connectivity/source/drivers/postgresql/pq_xkey.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkey.cxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkey.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkey.cxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,262 @@
+/*************************************************************************
+ *
@@ -19202,8 +19202,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkey.cxx connectivity/source
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xkey.hxx connectivity/source/drivers/postgresql/pq_xkey.hxx
---- connectivity/source/drivers/postgresql/pq_xkey.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkey.hxx 2011-09-09 12:00:02.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkey.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkey.hxx 2011-09-09 12:00:02.000000000 +0200
@@ -0,0 +1,152 @@
+/*************************************************************************
+ *
@@ -19358,8 +19358,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkey.hxx connectivity/source
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xkeys.cxx connectivity/source/drivers/postgresql/pq_xkeys.cxx
---- connectivity/source/drivers/postgresql/pq_xkeys.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeys.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeys.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeys.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,388 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -19750,8 +19750,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeys.cxx connectivity/sourc
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xkeys.hxx connectivity/source/drivers/postgresql/pq_xkeys.hxx
---- connectivity/source/drivers/postgresql/pq_xkeys.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xkeys.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeys.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xkeys.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
@@ -19888,8 +19888,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xkeys.hxx connectivity/sourc
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xtable.cxx connectivity/source/drivers/postgresql/pq_xtable.cxx
---- connectivity/source/drivers/postgresql/pq_xtable.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xtable.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtable.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtable.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,485 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -20377,8 +20377,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xtable.cxx connectivity/sour
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xtable.hxx connectivity/source/drivers/postgresql/pq_xtable.hxx
---- connectivity/source/drivers/postgresql/pq_xtable.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xtable.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtable.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtable.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,220 @@
+/*************************************************************************
+ *
@@ -20601,8 +20601,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xtable.hxx connectivity/sour
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xtables.cxx connectivity/source/drivers/postgresql/pq_xtables.cxx
---- connectivity/source/drivers/postgresql/pq_xtables.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xtables.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtables.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtables.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,464 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -21069,8 +21069,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xtables.cxx connectivity/sou
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xtables.hxx connectivity/source/drivers/postgresql/pq_xtables.hxx
---- connectivity/source/drivers/postgresql/pq_xtables.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xtables.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtables.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xtables.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,118 @@
+/*************************************************************************
+ *
@@ -21191,8 +21191,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xtables.hxx connectivity/sou
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xuser.cxx connectivity/source/drivers/postgresql/pq_xuser.cxx
---- connectivity/source/drivers/postgresql/pq_xuser.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xuser.cxx 2011-09-09 12:01:18.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xuser.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xuser.cxx 2011-09-09 12:01:18.000000000 +0200
@@ -0,0 +1,258 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -21453,8 +21453,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xuser.cxx connectivity/sourc
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xuser.hxx connectivity/source/drivers/postgresql/pq_xuser.hxx
---- connectivity/source/drivers/postgresql/pq_xuser.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xuser.hxx 2011-09-09 12:01:18.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xuser.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xuser.hxx 2011-09-09 12:01:18.000000000 +0200
@@ -0,0 +1,133 @@
+/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -21590,8 +21590,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xuser.hxx connectivity/sourc
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xusers.cxx connectivity/source/drivers/postgresql/pq_xusers.cxx
---- connectivity/source/drivers/postgresql/pq_xusers.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xusers.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xusers.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xusers.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,256 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
@@ -21850,8 +21850,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xusers.cxx connectivity/sour
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xusers.hxx connectivity/source/drivers/postgresql/pq_xusers.hxx
---- connectivity/source/drivers/postgresql/pq_xusers.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xusers.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xusers.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xusers.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
@@ -21970,8 +21970,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xusers.hxx connectivity/sour
+}
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xview.cxx connectivity/source/drivers/postgresql/pq_xview.cxx
---- connectivity/source/drivers/postgresql/pq_xview.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xview.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xview.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xview.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,285 @@
+/*************************************************************************
+ *
@@ -22259,8 +22259,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xview.cxx connectivity/sourc
+
+}
diff -urN connectivity/source/drivers/postgresql/pq_xview.hxx connectivity/source/drivers/postgresql/pq_xview.hxx
---- connectivity/source/drivers/postgresql/pq_xview.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xview.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xview.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xview.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
@@ -22396,8 +22396,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xview.hxx connectivity/sourc
+
+#endif
diff -urN connectivity/source/drivers/postgresql/pq_xviews.cxx connectivity/source/drivers/postgresql/pq_xviews.cxx
---- connectivity/source/drivers/postgresql/pq_xviews.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xviews.cxx 2011-09-09 12:01:00.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xviews.cxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xviews.cxx 2011-09-09 12:01:00.000000000 +0200
@@ -0,0 +1,304 @@
+/*************************************************************************
+ *
@@ -22704,8 +22704,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xviews.cxx connectivity/sour
+
+};
diff -urN connectivity/source/drivers/postgresql/pq_xviews.hxx connectivity/source/drivers/postgresql/pq_xviews.hxx
---- connectivity/source/drivers/postgresql/pq_xviews.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/source/drivers/postgresql/pq_xviews.hxx 2011-09-09 12:00:03.000000000 +0200
+--- libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xviews.hxx 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/source/drivers/postgresql/pq_xviews.hxx 2011-09-09 12:00:03.000000000 +0200
@@ -0,0 +1,118 @@
+/*************************************************************************
+ *
@@ -22826,8 +22826,8 @@ diff -urN connectivity/source/drivers/postgresql/pq_xviews.hxx connectivity/sour
+}
+#endif
diff -urN connectivity/workben/postgresql/ddl.py connectivity/workben/postgresql/ddl.py
---- connectivity/workben/postgresql/ddl.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/ddl.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/ddl.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/ddl.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,185 @@
+#*************************************************************************
+#
@@ -23015,8 +23015,8 @@ diff -urN connectivity/workben/postgresql/ddl.py connectivity/workben/postgresql
+
+ stmt.close()
diff -urN connectivity/workben/postgresql/main.py connectivity/workben/postgresql/main.py
---- connectivity/workben/postgresql/main.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/main.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/main.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/main.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,90 @@
+#*************************************************************************
+#
@@ -23109,8 +23109,8 @@ diff -urN connectivity/workben/postgresql/main.py connectivity/workben/postgresq
+
+runner.run(suite)
diff -urN connectivity/workben/postgresql/makefile.mk connectivity/workben/postgresql/makefile.mk
---- connectivity/workben/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/makefile.mk 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/makefile.mk 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
@@ -23216,8 +23216,8 @@ diff -urN connectivity/workben/postgresql/makefile.mk connectivity/workben/postg
+runtest : ALL
+ +cd $(DLLDEST) && python main.py "$(dburl)"
diff -urN connectivity/workben/postgresql/metadata.py connectivity/workben/postgresql/metadata.py
---- connectivity/workben/postgresql/metadata.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/metadata.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/metadata.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/metadata.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,151 @@
+#*************************************************************************
+#
@@ -23371,8 +23371,8 @@ diff -urN connectivity/workben/postgresql/metadata.py connectivity/workben/postg
+# rs.next()
+# print rs.getString( 1 )
diff -urN connectivity/workben/postgresql/preparedstatement.py connectivity/workben/postgresql/preparedstatement.py
---- connectivity/workben/postgresql/preparedstatement.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/preparedstatement.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/preparedstatement.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/preparedstatement.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,228 @@
+#*************************************************************************
+#
@@ -23603,8 +23603,8 @@ diff -urN connectivity/workben/postgresql/preparedstatement.py connectivity/work
+ self.failUnless( rs.next() )
+ self.failUnless( rs.getString(1) == "foo''l" )
diff -urN connectivity/workben/postgresql/sdbcx.py connectivity/workben/postgresql/sdbcx.py
---- connectivity/workben/postgresql/sdbcx.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/sdbcx.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/sdbcx.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/sdbcx.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,306 @@
+#*************************************************************************
+#
@@ -23913,8 +23913,8 @@ diff -urN connectivity/workben/postgresql/sdbcx.py connectivity/workben/postgres
+ users = dd.getUsers()
+ self.failUnless( "pqsdbc_joe" in users.getElementNames() )
diff -urN connectivity/workben/postgresql/statement.py connectivity/workben/postgresql/statement.py
---- connectivity/workben/postgresql/statement.py 1970-01-01 01:00:00.000000000 +0100
-+++ connectivity/workben/postgresql/statement.py 2011-09-09 12:00:08.000000000 +0200
+--- libreoffice-3.5.0/connectivity/workben/postgresql/statement.py 1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-3.5.0/connectivity/workben/postgresql/statement.py 2011-09-09 12:00:08.000000000 +0200
@@ -0,0 +1,277 @@
+#*************************************************************************
+#
diff --git a/patches/autogen.diff b/patches/autogen.diff
index 7bfc4b7..18b9507 100644
--- a/patches/autogen.diff
+++ b/patches/autogen.diff
@@ -1,5 +1,5 @@
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/aclocal.m4
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/aclocal.m4
@@ -0,0 +1,1168 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
@@ -1169,8 +1169,8 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/Makefile.in
@@ -0,0 +1,1007 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -2179,8 +2179,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/INSTALL
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/INSTALL
@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
@@ -2547,8 +2547,8 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/configure
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/configure
@@ -0,0 +1,8705 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
@@ -11255,8 +11255,8 @@
+ echo ""
+fi
+# vim: set ts=4 sw=4 expandtab :
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/missing
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/missing
@@ -0,0 +1,376 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
@@ -11634,8 +11634,8 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/install-sh
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/install-sh
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
@@ -12157,8 +12157,8 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/etc/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/etc/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -12603,8 +12603,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/Makefile.in
@@ -0,0 +1,649 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -13255,8 +13255,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/postgresql/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/postgresql/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -13701,8 +13701,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/hotfixes/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -14147,8 +14147,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/64bit/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/64bit/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -14593,8 +14593,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/dev300/Makefile.in
@@ -0,0 +1,460 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -15056,8 +15056,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/mono/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/mono/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -15502,8 +15502,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/patches/vba/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/patches/vba/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -15948,8 +15948,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/templates/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/templates/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -16394,8 +16394,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/man/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/man/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -16840,8 +16840,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/doc/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/doc/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -17286,8 +17286,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/bin/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/bin/Makefile.in
@@ -0,0 +1,692 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -17981,8 +17981,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/bin/piece/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/bin/piece/Makefile.in
@@ -0,0 +1,468 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -18452,8 +18452,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/po/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/po/Makefile.in
@@ -0,0 +1,684 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -19139,8 +19139,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/po/sdf-templates/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/po/sdf-templates/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -19585,8 +19585,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/extensions/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/extensions/Makefile.in
@@ -0,0 +1,645 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -20233,8 +20233,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/extensions/tweakconfig/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/extensions/tweakconfig/Makefile.in
@@ -0,0 +1,457 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -20693,8 +20693,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/src/layout/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/src/layout/Makefile.in
@@ -0,0 +1,450 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -21146,8 +21146,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/src/helpcontent2/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/src/helpcontent2/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -21592,8 +21592,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/src/icons/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/src/icons/Makefile.in
@@ -0,0 +1,646 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -22241,8 +22241,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/src/icons/tango/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/src/icons/tango/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -22687,8 +22687,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/src/sdf/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/src/sdf/Makefile.in
@@ -0,0 +1,443 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -23133,8 +23133,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/stamp/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/stamp/Makefile.in
@@ -0,0 +1,455 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -23591,8 +23591,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
---- /dev/null
-+++ libreoffice-3.4.0/libreoffice-build/distro-configs/Makefile.in
+--- libreoffice-3.5.0//dev/null
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/distro-configs/Makefile.in
@@ -0,0 +1,604 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
diff --git a/patches/bsh-hardcode-path.diff b/patches/bsh-hardcode-path.diff
index 805c660..bcc250e 100644
--- a/patches/bsh-hardcode-path.diff
+++ b/patches/bsh-hardcode-path.diff
@@ -1,5 +1,5 @@
---- scripting/java/build.xml 2011-06-28 11:11:12.000000000 +0000
-+++ scripting/java/build.xml-old 2011-06-28 11:10:53.000000000 +0000
+--- libreoffice-3.5.0/scripting/java/build.xml 2011-06-28 11:11:12.000000000 +0000
++++ libreoffice-3.5.0/scripting/java/build.xml-old 2011-06-28 11:10:53.000000000 +0000
@@ -52,7 +52,7 @@
<pathelement location="${solar.jar}/juh.jar"/>
<pathelement location="${solar.jar}/java_uno.jar"/>
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index e8f35a5..3abc916 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,7 +1,7 @@
diff --git a/configure.in b/configure.in
index 3257668..afd36de 100755
---- configure.in
-+++ configure.in
+--- libreoffice-3.5.0/configure.in
++++ libreoffice-3.5.0/configure.in
@@ -1663,8 +1663,13 @@ dnl whether to include symbols into final build.
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols])
@@ -20,8 +20,8 @@ index 3257668..afd36de 100755
AC_MSG_RESULT([no])
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..9338110 100644
---- solenv/inc/unxgcc.mk
-+++ solenv/inc/unxgcc.mk
+--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
++++ libreoffice-3.5.0/solenv/inc/unxgcc.mk
@@ -73,7 +73,11 @@
CFLAGS+=-fmessage-length=0 -c
@@ -46,8 +46,8 @@ index c73333f..9338110 100644
CFLAGSDBGUTIL=
GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
---- solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05 12:38:23.398653265 +0200
-+++ solenv/gbuild/platform/unxgcc.mk 2011-07-05 14:10:50.598728992 +0200
+--- libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05 12:38:23.398653265 +0200
++++ libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk 2011-07-05 14:10:50.598728992 +0200
@@ -217,14 +217,19 @@
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
diff --git a/patches/disable-dynamic-list-cpp.diff b/patches/disable-dynamic-list-cpp.diff
index d94f172..4df2605 100644
--- a/patches/disable-dynamic-list-cpp.diff
+++ b/patches/disable-dynamic-list-cpp.diff
@@ -13,8 +13,8 @@ Subject: [PATCH 5/5] disable
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7ad122e..2c3d4b5 100755
---- solenv/gbuild/platform/unxgcc.mk
-+++ solenv/gbuild/platform/unxgcc.mk
+--- libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk
++++ libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk
@@ -130,8 +130,6 @@ endif
ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
@@ -26,8 +26,8 @@ index 7ad122e..2c3d4b5 100755
endif
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..8c19388 100644
---- solenv/inc/unxgcc.mk
-+++ solenv/inc/unxgcc.mk
+--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
++++ libreoffice-3.5.0/solenv/inc/unxgcc.mk
@@ -180,7 +180,7 @@ LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
diff --git a/patches/disable-ooinstall-in-package-ooo.diff b/patches/disable-ooinstall-in-package-ooo.diff
index ced3861..87aa56b 100644
--- a/patches/disable-ooinstall-in-package-ooo.diff
+++ b/patches/disable-ooinstall-in-package-ooo.diff
@@ -1,7 +1,7 @@
diff --git a/bin/package-ooo b/bin/package-ooo
index 040ea48..389627f 100755
---- libreoffice-3.4.0/libreoffice-build/bin/package-ooo
-+++ libreoffice-3.4.0/libreoffice-build/bin/package-ooo
+--- libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/bin/package-ooo
++++ libreoffice-3.5.0/libreoffice-3.4.0/libreoffice-build/bin/package-ooo
@@ -34,10 +34,6 @@ if test "z$PIECE" != "z"; then
exit 0;
fi
diff --git a/patches/disable-rhino.diff b/patches/disable-rhino.diff
index d02dd64..fc8bb66 100644
--- a/patches/disable-rhino.diff
+++ b/patches/disable-rhino.diff
@@ -1,5 +1,5 @@
---- scripting/prj/build.lst-old 2011-06-27 20:07:54.000000000 +0000
-+++ scripting/prj/build.lst 2011-06-27 20:06:28.000000000 +0000
+--- libreoffice-3.5.0/scripting/prj/build.lst-old 2011-06-27 20:07:54.000000000 +0000
++++ libreoffice-3.5.0/scripting/prj/build.lst 2011-06-27 20:06:28.000000000 +0000
@@ -1,4 +1,4 @@
-tc scripting : filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc scripting : filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
@@ -7,8 +7,8 @@
tc scripting\inc nmake - all tc1_inc NULL
tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL
diff -urN scripting-old//java/build.xml scripting/java/build.xml
---- scripting-old//java/build.xml 2011-06-28 08:26:38.000000000 +0000
-+++ scripting/java/build.xml 2011-06-28 08:30:38.000000000 +0000
+--- libreoffice-3.5.0/scripting-old//java/build.xml 2011-06-28 08:26:38.000000000 +0000
++++ libreoffice-3.5.0/scripting/java/build.xml 2011-06-28 08:30:38.000000000 +0000
@@ -53,7 +53,6 @@
<pathelement location="${solar.jar}/java_uno.jar"/>
<pathelement location="${solar.jar}/ridl.jar"/>
@@ -48,8 +48,8 @@ diff -urN scripting-old//java/build.xml scripting/java/build.xml
<delete file="${jardir}/ScriptFramework.jar"/>
<delete file="${jardir}/office.jar"/>
diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
---- scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
-+++ scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
+--- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
++++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,351 +0,0 @@
-/*************************************************************************
- *
@@ -403,8 +403,8 @@ diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/
- }
-}
diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
---- scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
-+++ scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
+--- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
++++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,392 +0,0 @@
-/*************************************************************************
-*
@@ -799,8 +799,8 @@ diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/
-}
-
diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/template.js scripting/java/com/sun/star/script/framework/provider/javascript/template.js
---- scripting-old//java/com/sun/star/script/framework/provider/javascript/template.js 2011-06-28 08:26:37.000000000 +0000
-+++ scripting/java/com/sun/star/script/framework/provider/javascript/template.js 1970-01-01 00:00:00.000000000 +0000
+--- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/template.js 2011-06-28 08:26:37.000000000 +0000
++++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/template.js 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// Hello World in JavaScript
-// Import standard OpenOffice.org API classes. For more information on
@@ -840,8 +840,8 @@ diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/
-xTextRange = xText.getEnd();
-xTextRange.setString( "Hello World (in JavaScript)" );
diff -urN scp2-old//source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp
---- scp2-old//source/ooo/file_ooo.scp 2011-06-28 08:32:41.000000000 +0000
-+++ scp2/source/ooo/file_ooo.scp 2011-06-28 08:33:19.000000000 +0000
+--- libreoffice-3.5.0/scp2-old//source/ooo/file_ooo.scp 2011-06-28 08:32:41.000000000 +0000
++++ libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp 2011-06-28 08:33:19.000000000 +0000
@@ -1261,12 +1256,6 @@
End
#endif
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
new file mode 100644
index 0000000..105bf79
--- /dev/null
+++ b/patches/fix-system-lpsolve-build.diff
@@ -0,0 +1,33 @@
+diff --git a/configure.in b/configure.in
+index d9d28ff..4fcbe7c 100644
+--- libreoffice-3.5.0/configure.in
++++ libreoffice-3-5.0/configure.in
+@@ -6474,8 +6474,9 @@ if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
+ # some systems need this. Like Ubuntu....
+ AC_CHECK_LIB(m, floor)
+ AC_CHECK_LIB(dl, dlopen)
++ AC_CHECK_LIB(colamd, colamd)
+ AC_CHECK_LIB(lpsolve55, make_lp, ,
+- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++ [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
+ MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS lpsolve55.dll"
+ else
+ AC_MSG_RESULT([internal])
+diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
+index 91161f1..eb9885e 100644
+--- libreoffice-3.5.0/solenv/inc/libs.mk
++++ libreoffice-3.5.0/solenv/inc/libs.mk
+@@ -305,7 +305,13 @@ MYTHESLIB=$(MYTHES_LIBS)
+ MYTHESLIB=-lmythes-1.2
+ .ENDIF
+ PYUNOLIB=-lpyuno
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
++# /usr/lib gets picked and we get a static link...
++LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
++.ELSE
+ LPSOLVELIB=-llpsolve55
++.ENDIF
+ SOFFICELIB=-lsofficeapp
+ UNOPKGAPPLIB=-lunopkgapp
+ TESTLIB=-lunotest
diff --git a/patches/gcc4.6.0.diff b/patches/gcc4.6.0.diff
index f5498c3..c6aa293 100644
--- a/patches/gcc4.6.0.diff
+++ b/patches/gcc4.6.0.diff
@@ -1,5 +1,5 @@
---- cli_ure/util/makefile.pmk-old 2011-04-30 12:45:51.000000000 +0000
-+++ cli_ure/util/makefile.pmk 2011-04-30 12:45:55.000000000 +0000
+--- libreoffice-3.5.0/cli_ure/util/makefile.pmk-old 2011-04-30 12:45:51.000000000 +0000
++++ libreoffice-3.5.0/cli_ure/util/makefile.pmk 2011-04-30 12:45:55.000000000 +0000
@@ -29,7 +29,6 @@
.IF "$(L10N_framework)"==""
.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
diff --git a/patches/jurt-soffice-location.diff b/patches/jurt-soffice-location.diff
index 06cde9a..b10cb78 100644
--- a/patches/jurt-soffice-location.diff
+++ b/patches/jurt-soffice-location.diff
@@ -8,8 +8,8 @@ CommitDate: Tue Jun 7 11:52:37 2011 +0200
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.jav
index da22980..36664ca 100644
---- jurt/com/sun/star/lib/util/NativeLibraryLoader.java
-+++ jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+--- libreoffice-3.5.0/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
++++ libreoffice-3.5.0/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -111,6 +111,8 @@ public final class NativeLibraryLoader {
}
}
diff --git a/patches/libebook-1.2.so.11.diff b/patches/libebook-1.2.so.11.diff
index 4148ac6..e72afcb 100644
--- a/patches/libebook-1.2.so.11.diff
+++ b/patches/libebook-1.2.so.11.diff
@@ -9,8 +9,8 @@ Subject: [PATCH 2/2] libebook-1.2.so SONAME bumped again
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 1767ec1..f93d67a 100644
---- connectivity/source/drivers/evoab2/EApi.cxx
-+++ connectivity/source/drivers/evoab2/EApi.cxx
+--- libreoffice-3.5.0/connectivity/source/drivers/evoab2/EApi.cxx
++++ libreoffice-3.5.0/connectivity/source/drivers/evoab2/EApi.cxx
@@ -35,6 +35,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
index 3e8ca6b..becb35c 100644
--- a/patches/make-gengal-work-again.diff
+++ b/patches/make-gengal-work-again.diff
@@ -1,5 +1,5 @@
---- svx/source/gengal/makefile.mk-old 2011-08-12 20:08:29.000000000 +0200
-+++ svx/source/gengal/makefile.mk 2011-08-12 20:09:00.000000000 +0200
+--- libreoffice-3.5.0/svx/source/gengal/makefile.mk-old 2011-08-12 20:08:29.000000000 +0200
++++ libreoffice-3.5.0/svx/source/gengal/makefile.mk 2011-08-12 20:09:00.000000000 +0200
@@ -37,7 +37,6 @@
# --- Settings -----------------------------------------------------
@@ -17,8 +17,8 @@
.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
APP1TARGET= $(TARGET)
.ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
---- svx/source/gengal/gengal.cxx-old 2011-08-12 20:12:31.000000000 +0200
-+++ svx/source/gengal/gengal.cxx 2011-08-12 20:14:09.000000000 +0200
+--- libreoffice-3.5.0/svx/source/gengal/gengal.cxx-old 2011-08-12 20:12:31.000000000 +0200
++++ libreoffice-3.5.0/svx/source/gengal/gengal.cxx 2011-08-12 20:14:09.000000000 +0200
@@ -101,7 +101,7 @@
static void createTheme( rtl::OUString aThemeName,
rtl::OUString aGalleryURL,
@@ -41,8 +41,8 @@
{
rtl::OUString aParam = GetCommandLineParam( i );
---- /dev/null 2011-08-03 18:17:49.619073942 +0200
-+++ svx/source/gengal/gengalrc.in 2011-08-12 20:16:21.000000000 +0200
+--- libreoffice-3.5.0//dev/null 2011-08-03 18:17:49.619073942 +0200
++++ libreoffice-3.5.0/svx/source/gengal/gengalrc.in 2011-08-12 20:16:21.000000000 +0200
@@ -0,0 +1,12 @@
+OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
+OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
@@ -56,8 +56,8 @@
+#
+UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
+UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
---- /dev/null 2011-08-03 18:17:49.619073942 +0200
-+++ svx/source/gengal/gengal.sh 2011-08-12 20:16:25.000000000 +0200
+--- libreoffice-3.5.0//dev/null 2011-08-03 18:17:49.619073942 +0200
++++ libreoffice-3.5.0/svx/source/gengal/gengal.sh 2011-08-12 20:16:25.000000000 +0200
@@ -0,0 +1,101 @@
+#!/bin/sh
+#*************************************************************************
diff --git a/patches/mipsel-jfw-plugin-arch.diff b/patches/mipsel-jfw-plugin-arch.diff
deleted file mode 100644
index 9791832..0000000
--- a/patches/mipsel-jfw-plugin-arch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx-old 2011-08-19 17:16:05.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx 2011-08-19 17:14:42.000000000 +0200
-@@ -56,7 +56,7 @@
- #ifdef OSL_BIGENDIAN
- # define JFW_PLUGIN_ARCH "mips"
- #else
--# define JFW_PLUGIN_ARCH "mips32"
-+# define JFW_PLUGIN_ARCH "mipsel"
- #endif
- #elif defined S390X
- #define JFW_PLUGIN_ARCH "s390x"
diff --git a/patches/no-deprecated-options-in-qstart-wrappers.diff b/patches/no-deprecated-options-in-qstart-wrappers.diff
index bb791f4..b1907f7 100644
--- a/patches/no-deprecated-options-in-qstart-wrappers.diff
+++ b/patches/no-deprecated-options-in-qstart-wrappers.diff
@@ -1,5 +1,5 @@
---- libreoffice-3.4.3/libreoffice-build/bin/package-ooo.old 2011-08-31 19:09:00.000000000 +0200
-+++ libreoffice-3.4.3/libreoffice-build/bin/package-ooo 2011-08-31 19:10:24.000000000 +0200
+--- libreoffice-3.5.0/libreoffice-3.4.3/libreoffice-build/bin/package-ooo.old 2011-08-31 19:09:00.000000000 +0200
++++ libreoffice-3.5.0/libreoffice-3.4.3/libreoffice-build/bin/package-ooo 2011-08-31 19:10:24.000000000 +0200
@@ -77,9 +77,9 @@
# startup wrappers
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
index 6d11efb..f9fb068 100644
--- a/patches/no-minimaltoc.diff
+++ b/patches/no-minimaltoc.diff
@@ -1,5 +1,5 @@
---- solenv/inc/unxlngppc64.mk
-+++ solenv/inc/unxlngppc64.mk
+--- libreoffice-3.5.0/solenv/inc/unxlngppc64.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngppc64.mk
@@ -30,5 +30,4 @@
.INCLUDE : unxlngppc.mk
diff --git a/patches/odk-jni-include.diff b/patches/odk-jni-include.diff
index 6c4b35d..60f1591 100644
--- a/patches/odk-jni-include.diff
+++ b/patches/odk-jni-include.diff
@@ -1,5 +1,5 @@
---- odk/source/unowinreg/win/makefile.mk-old 2011-06-25 10:18:32.000000000 +0200
-+++ odk/source/unowinreg/win/makefile.mk 2011-06-25 10:19:22.000000000 +0200
+--- libreoffice-3.5.0/odk/source/unowinreg/win/makefile.mk-old 2011-06-25 10:18:32.000000000 +0200
++++ libreoffice-3.5.0/odk/source/unowinreg/win/makefile.mk 2011-06-25 10:19:22.000000000 +0200
@@ -62,7 +62,7 @@
.IF "$(BUILD_UNOWINREG)" == "YES"
diff --git a/patches/packcomponents-remove-split-components.diff b/patches/packcomponents-remove-split-components.diff
index e8d8ae8..c5a7ea3 100644
--- a/patches/packcomponents-remove-split-components.diff
+++ b/patches/packcomponents-remove-split-components.diff
@@ -1,5 +1,5 @@
---- postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
-+++ postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
+--- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
++++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
@@ -229,10 +229,6 @@
my_components += ucpgvfs
.END
diff --git a/patches/series b/patches/series
index c001097..bf25613 100644
--- a/patches/series
+++ b/patches/series
@@ -1,19 +1,18 @@
splash-progressbarcolor.diff
no-minimaltoc.diff
-update-debian-opt.diff
+#l-b#update-debian-opt.diff
gcc4.6.0.diff
odk-jni-include.diff
-disable-ooinstall-in-package-ooo.diff
+#l-b#disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
-debian-debug.diff
-disable-rhino.diff
-bsh-hardcode-path.diff
+#debian-debug.diff
+#disable-rhino.diff
+#bsh-hardcode-path.diff
autogen.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
-vbaobj-visibility-fix.diff
-make-gengal-work-again.diff
-mipsel-jfw-plugin-arch.diff
-no-deprecated-options-in-qstart-wrappers.diff
-add-sdbc-postgresql.diff
+#make-gengal-work-again.diff
+#l-b#no-deprecated-options-in-qstart-wrappers.diff
+#add-sdbc-postgresql.diff
+fix-system-lpsolve-build.diff
diff --git a/patches/splash-progressbarcolor.diff b/patches/splash-progressbarcolor.diff
index 2f402bb..3b243d7 100644
--- a/patches/splash-progressbarcolor.diff
+++ b/patches/splash-progressbarcolor.diff
@@ -1,5 +1,5 @@
---- instsetoo_native/util/openoffice.lst-old 2008-08-06 00:03:46.000000000 +0200
-+++ instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000 +0200
+--- libreoffice-3.5.0/instsetoo_native/util/openoffice.lst-old 2008-08-06 00:03:46.000000000 +0200
++++ libreoffice-3.5.0/instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000 +0200
@@ -25,7 +25,7 @@
POOLPRODUCT 1
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
diff --git a/patches/vbaobj-visibility-fix.diff b/patches/vbaobj-visibility-fix.diff
deleted file mode 100644
index 7daf4c2..0000000
--- a/patches/vbaobj-visibility-fix.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg10561.html
-
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
-
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbaquerytable \
- sc/source/ui/vba/vbarange \
- sc/source/ui/vba/vbasheetobject \
-- sc/source/ui/vba/vbasheetobjects \
- sc/source/ui/vba/vbastyle \
- sc/source/ui/vba/vbastyles \
- sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbawsfunction \
- ))
-
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+ sc/source/ui/vba/vbasheetobjects \
-+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- $$(LDFLAGS) \
--
LibreOffice packaging repository
Reply to: