This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository grass.
commit 0898324e6236ac4491324ade7908ef0e7120c7e7
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Oct 8 14:41:58 2016 +0200
Reinstate MySQL/MariaDB support, mariadb-10.0 available on mips64el now.
Changes:
- Add default-libmysqlclient-dev build dependency
- Add --with-mysql* configure options
--------------------------------------------------------------------------------
Revert "Drop libmysqlclient-dev dependency, default-libmysqlclient-dev
should be used instead, but its dependencies cannot be satisfied on mips64el."
This reverts commit f5b20d40f1475c2e82e51675b252f117cc35a855.
Conflicts:
debian/changelog
--------------------------------------------------------------------------------
Revert "Drop --with-mysql configure options to disable MySQL/MariaDB
support."
This reverts commit 2594cf19dcae18655bf2531deeaea9aa8da3e1bd.
---
debian/changelog | 9 +++++++++
debian/control | 1 +
debian/rules | 2 ++
3 files changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e3226eb..31ffeda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grass (7.0.5-2) UNRELEASED; urgency=medium
+
+ * Reinstate MySQL/MariaDB support, mariadb-10.0 available on mips64el now.
+ Changes:
+ - Add default-libmysqlclient-dev build dependency
+ - Add --with-mysql* configure options
+
+ -- Bas Couwenberg <sebas...@debian.org> Sat, 08 Oct 2016 14:43:42 +0200
+
grass (7.0.5-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 3de7b89..2370844 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: autoconf2.13,
liblapack-dev,
liblas-c-dev (>= 1.8.0-8~),
libmotif-dev | lesstif2-dev,
+ default-libmysqlclient-dev,
libncurses5-dev,
libnetcdf-dev,
libpng-dev,
diff --git a/debian/rules b/debian/rules
index 409198c..3f67b9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,6 +88,8 @@ override_dh_auto_configure: templates
--with-lapack \
--with-liblas=/usr/bin/liblas-config \
--with-motif \
+ --with-mysql \
+ --with-mysql-includes=$(shell mysql_config --include | sed
-e 's/-I//') \
--with-netcdf \
--with-nls \
--with-odbc \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
