[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-173-g3127934
The following commit has been merged in the debian-experimental-3.5 branch:
commit 3127934835c61168a8ec5bf267e9a4e2b7700164
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 21 21:35:22 2011 +0000
migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
diff --git a/changelog b/changelog
index f4d8220..5eda3fe 100644
--- a/changelog
+++ b/changelog
@@ -33,6 +33,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
* debian/patches:
- migrate reportdesign-mention-package.diff from libreoffice/build
- migrate jdbc-driver-classpaths.diff from libreoffice/build
+ - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
[ Bjoern Michaelsen ]
* debian/rules:
@@ -51,7 +52,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
sensible-lomua; add icedove and thunderbird as fallbacks
- migrate sensible-browser.diff from libreoffice/build
- -- Rene Engelhard <rene@debian.org> Wed, 21 Dec 2011 22:26:04 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 21 Dec 2011 22:32:48 +0100
libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
diff --git a/patches/mysqlcppconn-mysqlclient-SONAME.diff b/patches/mysqlcppconn-mysqlclient-SONAME.diff
new file mode 100644
index 0000000..ab5d5a4
--- /dev/null
+++ b/patches/mysqlcppconn-mysqlclient-SONAME.diff
@@ -0,0 +1,20 @@
+diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+index 9d9a8ad..b8cccf7 100644
+--- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch
++++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+@@ -235,3 +235,15 @@
+ +
+ +# --- Targets ------------------------------------------------------
+ +.INCLUDE : target.mk
++diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
++--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
+++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 20:25:31.000000000 +0200
++@@ -26,7 +26,7 @@
++ #elif defined(__APPLE__)
++ 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";
++ #endif
++
++ template<typename FunctionType>
diff --git a/patches/series b/patches/series
index 8a347d2..a3abc8a 100644
--- a/patches/series
+++ b/patches/series
@@ -20,3 +20,4 @@ sensible-browser.diff
fix-unordf_complex-check.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
+mysqlcppconn-mysqlclient-SONAME.diff
--
LibreOffice packaging repository
Reply to: