[gdal] 02/03: Reinstate MySQL/MariaDB support, mariadb-10.0 available on mips64el now.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository gdal.

commit a13ba5a739dc649289157ab1e701f9a0dfe3730a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 8 14:51:52 2016 +0200

    Reinstate MySQL/MariaDB support, mariadb-10.0 available on mips64el now.
    
    Changes:
    - Add default-libmysqlclient-dev (build) dependency
    - Add --with-mysql configure option
    - Add RegisterOGRMySQL at Base symbol
    
    --------------------------------------------------------------------------------
    
    Revert "Remove MySQL support. The dependencies via default-libmysqlclient-dev cannot be satisfied on all release architectures."
    
    This reverts commit 9e15bc4aa2e7c203ceebccdbd5a997cf544885e5.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                | 5 +++++
 debian/control                  | 2 ++
 debian/libgdal20.symbols.common | 1 +
 debian/rules                    | 1 +
 4 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cdbfecf..a92bc60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 gdal (2.1.1+dfsg-5) UNRELEASED; urgency=medium
 
   * Update spelling-errors.patch to fix additional typos.
+  * Reinstate MySQL/MariaDB support, mariadb-10.0 available on mips64el now.
+    Changes:
+    - Add default-libmysqlclient-dev (build) dependency
+    - Add --with-mysql configure option
+    - Add RegisterOGRMySQL at Base symbol
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 08 Oct 2016 14:51:56 +0200
 
diff --git a/debian/control b/debian/control
index 20503e8..531fe8c 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends: debhelper (>= 9),
                libjson-c-dev,
                libkml-dev (>= 1.3.0~rc0-3),
                liblzma-dev,
+       default-libmysqlclient-dev,
                libnetcdf-dev (>= 1:4.0.0),
                libogdi3.2-dev,
                libopenjp2-7-dev,
@@ -111,6 +112,7 @@ Depends: libgdal20 (= ${binary:Version}),
          libkml-dev,
          libltdl-dev,
          liblzma-dev,
+ default-libmysqlclient-dev,
          libnetcdf-dev,
          libogdi3.2-dev,
          libopenjp2-7-dev,
diff --git a/debian/libgdal20.symbols.common b/debian/libgdal20.symbols.common
index c94f8ed..e6f705d 100644
--- a/debian/libgdal20.symbols.common
+++ b/debian/libgdal20.symbols.common
@@ -1565,6 +1565,7 @@
  RegisterOGRLIBKML at Base 1.9.0
  RegisterOGRMEM at Base 1.8.0
  RegisterOGRMSSQLSpatial at Base 1.8.0
+ RegisterOGRMySQL at Base 1.8.0
  RegisterOGRNAS at Base 1.8.0
  RegisterOGRNTF at Base 1.8.0
  RegisterOGRODBC at Base 1.8.0
diff --git a/debian/rules b/debian/rules
index c1a350a..4965661 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,7 @@ override_dh_auto_configure:
 			--with-liblzma=yes \
 			--with-libtiff=yes \
 			--with-mrsid=no \
+			--with-mysql \
 			--with-netcdf \
 			--with-odbc \
 			--with-ogdi \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git