This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit eb41b548a05410173805da73a222571de89245b1 Author: Rene Engelhard <r...@debian.org> Date: Tue Aug 16 04:45:57 2016 +0200 rework MySQL/MariaDB conditionals; allow default-libmysqlclient-dev --- changelog | 3 ++- rules | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/changelog b/changelog index 02bf377..262af29 100644 --- a/changelog +++ b/changelog @@ -3,10 +3,11 @@ libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium * debian/rules: - filter-out kfreebsd-i386 and kfreebsd-amd64 explicitly out of OOO_CHECK_ARCHS to save unneeded build-deps (again) + - rework MySQL/MariaDB conditionals; allow default-libmysqlclient-dev * debian/control.mysql.in: add default-mysql-server as first alternative to the Suggests - -- Rene Engelhard <r...@debian.org> Tue, 16 Aug 2016 04:08:56 +0200 + -- Rene Engelhard <r...@debian.org> Tue, 16 Aug 2016 04:45:09 +0200 libreoffice (1:5.2.0-2) unstable; urgency=medium diff --git a/rules b/rules index db80c41..aeb5ab3 100755 --- a/rules +++ b/rules @@ -417,7 +417,7 @@ endif DEFAULT_IMAGE=galaxy IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze ENABLE_MYSQLNATIVE=y -USE_MARIADB=n +MYSQL_FLAVOUR=mysql # set this also to y for system-mysql.. SYSTEM_STUFF += mariadb SYSTEM_STUFF += mysql-cppconn @@ -1307,19 +1307,25 @@ endif ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector - ifneq "$(USE_MARIADB)" "y" - ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF))) + ifeq "$(MYSQL_FLAVOUR)" "default" + BUILD_DEPS += , default-libmysqlclient-dev + else + ifeq "$(MYSQL_FLAVOUR)" "mysql" + ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF))) BUILD_DEPS += , libmysqlclient-dev + endif + MARIADBCONFIG=/usr/bin/mysql_config endif - MARIADBCONFIG=/usr/bin/mysql_config - else - ifneq (,$(filter mariadb, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmariadb-client-lgpl-dev + ifeq "$(MYSQL_FLAVOUR)" "mariadb" + ifneq (,$(filter mariadb, $(SYSTEM_STUFF))) + # deducted from default-libmysqlclient-dev Depends + BUILD_DEPS += , libmariadbclient-dev-compat + endif + MARIADBCONFIG=/usr/bin/mariadb_config endif - MARIADBCONFIG=/usr/bin/mariadb_config - endif - ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF))) + 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