[libreoffice] 04/11: Fix adding the libmysqlcppconn-dev Build-Dep in the default case

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit f46f2b68cfd6ef2e85c3edb221dd7ad6156e1489
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 12:51:56 2016 +0100

    Fix adding the libmysqlcppconn-dev Build-Dep in the default case
---
 changelog | 1 +
 control   | 1 +
 rules     | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1b5475b..a9b744c 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ libreoffice (1:5.2.3-1) UNRELEASED; urgency=medium
     - enable mysql-connector again now that libmysqlcppconn _and_
       mysql-workbench are built against mariadb.
       Bump (Build-)Dependency on libmysqlcppconn to >= 1.1.7-3 to go sure
+      Fix adding the libmysqlcppconn-dev Build-Dep in the default case
 
  -- Rene Engelhard <rene at debian.org>  Thu, 03 Nov 2016 19:18:20 +0100
 
diff --git a/control b/control
index 8df7076..3f664c8 100644
--- a/control
+++ b/control
@@ -95,6 +95,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                libmdds-dev (>= 1.2),
                libmspub-dev (>= 0.1),
                libmwaw-dev (>= 0.3.1),
+               libmysqlcppconn-dev (>= 1.1.7-3),
                libmythes-dev (>= 2:1.2),
                libneon27-gnutls-dev,
                libnss3-dev (>= 3.12.3),
diff --git a/rules b/rules
index bfdef17..ae0da5a 100755
--- a/rules
+++ b/rules
@@ -1318,9 +1318,9 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
       endif
       MARIADBCONFIG=/usr/bin/mariadb_config
     endif
-    ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
+  endif
+  ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
-    endif
   endif
 endif
 

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