[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit 096a0715d190cfbd4becdbc910a9c3e3423b6b38
Merge: 27073d4 f544276
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Aug 16 06:38:31 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

 changelog        | 4 ++--
 control          | 2 +-
 control.mysql.in | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc changelog
index cd0a3cd,35cbbef..11de1f6
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,11 +1,9 @@@
 -libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium
 +libreoffice (1:5.2.1~rc1-2) 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
+   * debian/control.mysql.in: use default-mysql-server | virtual-mysql-server
+     as MySQL Suggests
  
   -- Rene Engelhard <rene@debian.org>  Tue, 16 Aug 2016 04:45:09 +0200
  

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