[tango] 01/06: remove upstream applyed patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Dec 16 08:00:34 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 9e26fcf45f5597a974a4fcaef35991d65593ff16
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Dec 15 21:33:02 2016 +0100
remove upstream applyed patch
---
debian/patches/0005-fix-mysql-detection.patch | 43 ---------------------------
debian/patches/series | 1 -
2 files changed, 44 deletions(-)
diff --git a/debian/patches/0005-fix-mysql-detection.patch b/debian/patches/0005-fix-mysql-detection.patch
deleted file mode 100644
index c77af76..0000000
--- a/debian/patches/0005-fix-mysql-detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Fri, 28 Oct 2016 21:47:05 +0200
-Subject: fix mysql detection
-
----
- configure.ac | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6f1e0cb..28ff0b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -302,11 +302,15 @@ if test "x$enable_mariadb" != "xyes" ; then
- AC_MSG_WARN(No libmysqlclient libs found)
- enable_dbserver=no
- fi
--
-+
-+ DB_LDFLAGS=${MYSQLCLIENT_LDFLAGS}
-+ DB_LDLIBS=${MYSQLCLIENT_LIBS}
-+ DB_CFLAGS=${MYSQLCLIENT_CFLAGS}
-+
- AC_PATH_PROG(MYSQL, mysql, nocommand)
- MYSQL_VERSION=not_found
-
-- if test "$MYSQL" != nocommand; then
-+ if test "x$MYSQL" != "xnocommand"; then
- mysql_AC_HAVE_MYSQL_VERSION($MYSQL,5,5)
- if test "x$ac_cv_mysql_version_5_5" = "xno"; then
- AC_MSG_WARN([Not supported mysql release. Should be 5.5.x or above. Please update !],-1)
-@@ -335,11 +339,8 @@ if test "x$enable_mariadb" != "xyes" ; then
- ])
- ])
- ])
-- if test $MYSQL_VERSION != not_found; then
-+ if test "x$MYSQL_VERSION" != "xnot_found"; then
- DB_VERSION=${MYSQL_VERSION}
-- DB_LDFLAGS=${MYSQLCLIENT_LDFLAGS}
-- DB_LDLIBS=${MYSQLCLIENT_LIBS}
-- DB_CFLAGS=${MYSQLCLIENT_CFLAGS}
- fi
- else
- DB_NAME=MARIADB
diff --git a/debian/patches/series b/debian/patches/series
index 36cf780..ef298b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-debian-fix_database_scripts.patch
0002-debian-my.cnf.in.patch
0003-fix-doc.patch
-0005-fix-mysql-detection.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