[libreoffice] 01/01: -devel says default-mysql-server | virtual-mysql-server is what one should use
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit f544276ceaedc27446a5e5093d34c9c6131dbc42
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 16 06:38:01 2016 +0200
-devel says default-mysql-server | virtual-mysql-server is what one should use
---
changelog | 4 ++--
control | 2 +-
control.mysql.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 262af29..35cbbef 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,8 @@ libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium
- 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
diff --git a/control b/control
index 5667310..39913f8 100644
--- a/control
+++ b/control
@@ -4546,7 +4546,7 @@ Package: libreoffice-mysql-connector
Section: misc
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Suggests: default-mysql-server | mariadb-server | mysql-server (>= 5.1)
+Suggests: default-mysql-server | virtual-mysql-server
Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.mysql.in b/control.mysql.in
index 95c8bfa..8307bd6 100644
--- a/control.mysql.in
+++ b/control.mysql.in
@@ -2,7 +2,7 @@ Package: libreoffice-mysql-connector
Section: misc
Architecture: %OOO_BASE_ARCHS%
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Suggests: default-mysql-server | mariadb-server | mysql-server (>= 5.1)
+Suggests: default-mysql-server | virtual-mysql-server
Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: