[libreoffice] 01/01: MYSQL_FLAVOUR=mysql on jessie-backports

[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 1eaef460191ce69d77bec07cc2527dfec9cbdf55
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 11 13:32:29 2016 +0100

    MYSQL_FLAVOUR=mysql on jessie-backports
---
 changelog | 7 +++++++
 rules     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/changelog b/changelog
index 30680f3..dd4edfa 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.4~rc1-1) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - MYSQL_FLAVOUR=mysql on jessie-backports
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:31:35 +0100
+
 libreoffice (1:5.2.4~rc1-1) unstable; urgency=low
 
   * New upstream release candidate
diff --git a/rules b/rules
index da560dd..a6f77c9 100755
--- a/rules
+++ b/rules
@@ -416,7 +416,11 @@ endif
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
 ENABLE_MYSQLNATIVE=y
+ifneq "$(JESSIE_BACKPORT)" "y"
 MYSQL_FLAVOUR=default
+else
+MYSQL_FLAVOUR=mysql
+endif
 # set this also to y for system-mysql..
 SYSTEM_STUFF += mariadb
 SYSTEM_STUFF += mysql-cppconn

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