[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-12-gaa6c87b

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 5aa1df32fbd52b83128ec69f2d42c4580447a895
Author: Rene Engelhard <rene@debian.org>
Date:   Mon May 14 23:21:15 2012 +0200

    update internal mysqlcppconn for MySQL 5.5; build-depend on >= 5.5~ if using internal version

diff --git a/changelog b/changelog
index 1bc3eeb..2366ebd 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,9 @@ libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
   * debian/rules:
     - (temporarily) stop building -gcj even on kfreebsd-* to be able to get into
       testing (otherwise gcc-defaults is blocking...)
+  * debian/rules, debian/mysqlcppconn-mysqlclient-SONAME.diff: update
+    internal mysqlcppconn for MySQL 5.5 (.so-16 -> .so.18);
+    build-depend on >= 5.5~ if using internal version
 
   [ Andreas Beckmann ]
   * debian/shell-lib-extension.sh: set HOME to $INSTDIR also for
diff --git a/patches/mysqlcppconn-mysqlclient-SONAME.diff b/patches/mysqlcppconn-mysqlclient-SONAME.diff
index ab5d5a4..7923001 100644
--- a/patches/mysqlcppconn-mysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-mysqlclient-SONAME.diff
@@ -14,7 +14,7 @@ index 9d9a8ad..b8cccf7 100644
 + static const char * const baseName = "libmysqlclient_r.dylib";
 + #else
 +-static const char * const baseName = "libmysqlclient_r.so";
-++static const char * const baseName = "libmysqlclient_r.so.16";
+++static const char * const baseName = "libmysqlclient_r.so.18";
 + #endif
 + 
 + template<typename FunctionType>
diff --git a/rules b/rules
index b0e2316..c233d81 100755
--- a/rules
+++ b/rules
@@ -998,7 +998,11 @@ endif
 ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 	CONFIGURE_FLAGS += --enable-ext-mysql-connector
   ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
+    ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmysqlclient-dev
+    else
+	BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+    endif
   endif
   ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)

-- 
LibreOffice packaging repository