[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-10-g83f9d3d
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3ef5a7dd10775ea5aab0ec9d7ce619b3b9603fb2
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 19 17:36:11 2011 +0200
actually add patches/sdbc-postgresql-obsolete-hash-map.diff
diff --git a/patches/sdbc-postgresql-obsolete-hash-map.diff b/patches/sdbc-postgresql-obsolete-hash-map.diff
index 15233f3..33e694a 100644
--- a/patches/sdbc-postgresql-obsolete-hash-map.diff
+++ b/patches/sdbc-postgresql-obsolete-hash-map.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-08-13 19:39:41.368898920 +0000
-+++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/sdbc-postgresql-obsolete-hash-map.diff 2011-08-17 09:03:07.000000000 +0000
++++ libreoffice-3.4.2/libreoffice-build/patches/postgresql/sdbc-postgresql-obsolete-hash-map.diff 2011-08-17 09:03:07.000000000 +0000
@@ -0,0 +1,101 @@
+--- connectivity/source/drivers/postgresql/pq_connection.hxx.old 2011-08-16 12:26:22.000000000 +0200
++++ connectivity/source/drivers/postgresql/pq_connection.hxx 2011-08-16 16:39:55.000000000 +0200
@@ -102,3 +102,13 @@
+ ::std::equal_to< sal_Int32 >,
+ Allocator< ::std::pair< sal_Int32, DatabaseTypeDescription > >
+ > Oid2DatabaseTypeDescriptionMap;
+--- libreoffice-3.4.2/libreoffice-build/patches/dev300/apply-old 2011-08-17 17:34:25.000000000 +0000
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/apply 2011-08-17 17:34:39.000000000 +0000
+@@ -961,6 +961,7 @@
+ gcc-4.3-postgresql.diff
+ sdbc-postgresql-config_office.diff
+ sdbc-postgresql-oxt.diff
++sdbc-postgresql-obsolete-hash-map.diff
+
+ [ KDE4Experimental ]
+ # Not yet ported to co-exist with the KDE3 stuff
--
LibreOffice packaging repository
Reply to: