[tango] 03/03: release

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository tango.

commit 48d4a8635f45f7d3001a245a06e27b0088d4f3ab
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue May 24 21:54:46 2016 +0200

    release
---
 debian/changelog                                   |  6 +++++
 ...link-against-libmysqlclient-Closes-825081.patch | 26 +++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf539cb..2721dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tango (9.2.2+dfsg-1~exp4) experimental; urgency=medium
+
+  * merge with 8.1.2c+dfsg-8
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 24 May 2016 21:39:29 +0200
+
 tango (9.2.2+dfsg-1~exp3) experimental; urgency=medium
 
     + 0005-fix-FTBF-due-to-missing-cmath-include.patch (added)
diff --git a/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch b/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch
index f6d3867..1cfa2e0 100644
--- a/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch
+++ b/debian/patches/0011-link-against-libmysqlclient-Closes-825081.patch
@@ -4,16 +4,16 @@ Subject: link against libmysqlclient (Closes: #825081)
 
 ---
  configure                       | 10 +++++-----
- configure.in                    |  2 +-
+ configure.ac                    |  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
+index b2a7064..b1f6ea3 100755
 --- a/configure
 +++ b/configure
-@@ -18669,14 +18669,14 @@ fi
+@@ -18722,14 +18722,14 @@ fi
  $as_echo_n "checking for mysqlclient ... " >&6; }
      MYSQLCLIENT_LDFLAGS=""
      MYSQLCLIENT_CFLAGS=""
@@ -31,35 +31,35 @@ index dcca9b0..fc111bf 100755
                  MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
  			fi
  		done
-@@ -18785,8 +18785,8 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -18838,8 +18838,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:${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"], [
+diff --git a/configure.ac b/configure.ac
+index a01ea07..fea6f81 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -295,7 +295,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)
++                       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
+index 0efb145..8124cc5 100644
 --- a/cppserver/database/DataBase.cpp
 +++ b/cppserver/database/DataBase.cpp
-@@ -297,19 +297,6 @@ void DataBase::init_device()
+@@ -311,19 +311,6 @@ void DataBase::init_device()
  	WARN_STREAM << "DataBase::DataBase() create database device " << device_name << endl;
  
  //

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git