[tango] 01/03: release
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Tue May 24 20:17:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit 641ff045fa7d68fdc905594e2ab18e6109a40f54
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue May 24 20:09:26 2016 +0200
release
---
debian/changelog | 8 ++
...010-fix-FTBFS-824459-due-to-missing-cmath.patch | 20 ++++
...link-against-libmysqlclient-Closes-825081.patch | 104 +++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 134 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 208d5f3..eb24027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tango (8.1.2c+dfsg-8) unstable; urgency=medium
+
+ * debian/pacthes
+ + 0010-fix-FTBFS-824459-due-to-missing-cmath.patch (Closes: #824459)
+ + 0011-link-against-libmysqlclient-Closes-825081.patch (Closes: #825081)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 24 May 2016 20:06:02 +0200
+
tango (8.1.2c+dfsg-7) unstable; urgency=medium
* debian/patches
diff --git a/debian/patches/0010-fix-FTBFS-824459-due-to-missing-cmath.patch b/debian/patches/0010-fix-FTBFS-824459-due-to-missing-cmath.patch
new file mode 100644
index 0000000..372e20f
--- /dev/null
+++ b/debian/patches/0010-fix-FTBFS-824459-due-to-missing-cmath.patch
@@ -0,0 +1,20 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Tue, 24 May 2016 20:02:31 +0200
+Subject: fix FTBFS #824459 due to missing cmath
+
+---
+ lib/cpp/server/tango_config.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/cpp/server/tango_config.h b/lib/cpp/server/tango_config.h
+index 915d1e2..a2d4bbc 100644
+--- a/lib/cpp/server/tango_config.h
++++ b/lib/cpp/server/tango_config.h
+@@ -198,6 +198,7 @@
+
+ #ifndef _TG_WINDOWS_
+ #ifdef HAS_ISNAN_IN_STD
++ #include <cmath>
+ #define Tango_isnan(A) std::isnan(A)
+ #else
+ #define Tango_isnan(A) isnan(A)
diff --git a/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch b/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch
new file mode 100644
index 0000000..f6d3867
--- /dev/null
+++ b/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch
@@ -0,0 +1,104 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Tue, 24 May 2016 20:05:30 +0200
+Subject: link against libmysqlclient (Closes: #825081)
+
+---
+ configure | 10 +++++-----
+ configure.in | 2 +-
+ cppserver/database/DataBase.cpp | 13 -------------
+ m4/ac_path_mysqlclient.m4 | 6 +++---
+ 4 files changed, 9 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index dcca9b0..fc111bf 100755
+--- a/configure
++++ b/configure
+@@ -18669,14 +18669,14 @@ fi
+ $as_echo_n "checking for mysqlclient ... " >&6; }
+ MYSQLCLIENT_LDFLAGS=""
+ MYSQLCLIENT_CFLAGS=""
+- MYSQLCLIENT_LIBS="-lmysqlclient_r"
++ MYSQLCLIENT_LIBS="-lmysqlclient"
+ mysqlclient_fail=""
+
+ for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $mysqlclient_prefix ; do
+ for hloc in lib/mysql lib ; do
+- if test -f "$tryprefix/$hloc/libmysqlclient_r.so"; then
++ if test -f "$tryprefix/$hloc/libmysqlclient.so"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+- elif test -f "$tryprefix/$hloc/libmysqlclient_r.a"; then
++ elif test -f "$tryprefix/$hloc/libmysqlclient.a"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+ fi
+ done
+@@ -18785,8 +18785,8 @@ rm -f core conftest.err conftest.$ac_objext \
+
+ if test "x$MYSQLCLIENT_CFLAGS" = "x"
+ then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No libmysqlclient_r libs found" >&5
+-$as_echo "$as_me: WARNING: No libmysqlclient_r libs found" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No libmysqlclient libs found" >&5
++$as_echo "$as_me: WARNING: No libmysqlclient libs found" >&2;}
+ enable_dbserver=no
+ fi
+
+diff --git a/configure.in b/configure.in
+index 56045a1..69921b3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -311,7 +311,7 @@ AS_IF([test "x$enable_dbserver" = "xyes"], [
+ AM_PATH_MYSQLCLIENT
+ if test "x$MYSQLCLIENT_CFLAGS" = "x"
+ then
+- AC_MSG_WARN(No libmysqlclient_r libs found)
++ AC_MSG_WARN(No libmysqlclient libs found)
+ enable_dbserver=no
+ fi
+
+diff --git a/cppserver/database/DataBase.cpp b/cppserver/database/DataBase.cpp
+index a3d7dfc..75fd5a3 100644
+--- a/cppserver/database/DataBase.cpp
++++ b/cppserver/database/DataBase.cpp
+@@ -297,19 +297,6 @@ void DataBase::init_device()
+ WARN_STREAM << "DataBase::DataBase() create database device " << device_name << endl;
+
+ //
+-// Check if we are using the thread safe release of the MySQL library
+-//
+-
+- if (mysql_thread_safe() == 0)
+- {
+- ERROR_STREAM << "MySQL library used by this process is not tread safe. Please, use libmysqlclient_r" << endl;
+-
+- Tango::Except::throw_exception((const char *)DB_MySQLLibNotThreadSafe,
+- (const char *)"MySQL library used by this process is not thread safe. Please, use libmysqlclient_r or use DataBase release < 4.x",
+- (const char *)"DataBase::DataBase()");
+- }
+-
+-//
+ // Get user environment variables if defined
+ //
+
+diff --git a/m4/ac_path_mysqlclient.m4 b/m4/ac_path_mysqlclient.m4
+index 5ce6aa5..f73dfa8 100644
+--- a/m4/ac_path_mysqlclient.m4
++++ b/m4/ac_path_mysqlclient.m4
+@@ -31,15 +31,15 @@ AC_ARG_WITH(mysqlclient-lib,AC_HELP_STRING([--with-mysqlclient-lib=LIB],[Directo
+ AC_MSG_CHECKING([for mysqlclient ifelse([$1], , ,[>= v$1])])
+ MYSQLCLIENT_LDFLAGS=""
+ MYSQLCLIENT_CFLAGS=""
+- MYSQLCLIENT_LIBS="-lmysqlclient_r"
++ MYSQLCLIENT_LIBS="-lmysqlclient"
+ mysqlclient_fail=""
+
+ dnl test --with-mysqlclient-prefix
+ for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $mysqlclient_prefix ; do
+ for hloc in lib/mysql lib ; do
+- if test -f "$tryprefix/$hloc/libmysqlclient_r.so"; then
++ if test -f "$tryprefix/$hloc/libmysqlclient.so"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+- elif test -f "$tryprefix/$hloc/libmysqlclient_r.a"; then
++ elif test -f "$tryprefix/$hloc/libmysqlclient.a"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+ fi
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 651fcd8..8fe34ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
0007-fix-upstream-p812_3.patch
0008-fix-upstream-p812_4.patch
0009-fix-forwarded-upstream-gcc5.patch
+0010-fix-FTBFS-824459-due-to-missing-cmath.patch
+0011-link-against-libmysqlclient-Closes-825081.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list