[libreoffice] 01/01: suggest mariadb-server | mysql-server instead of just mysql-server
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c5ed07891e6e758818bf5b4d81e971b5e6e976f5
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 24 21:47:40 2014 +0100
suggest mariadb-server | mysql-server instead of just mysql-server
---
changelog | 4 +++-
control | 2 +-
control.mysql.in | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index d651455..8bd115f 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:4.1.5-2) UNRELEASED; urgency=medium
* debian/rules:
- enable gd (scottish_gaelic) l10n
+ * debian/control.mysql.in:
+ - suggest mariadb-server | mysql-server instead of just mysql-server
- -- Rene Engelhard <rene@debian.org> Thu, 13 Feb 2014 07:20:36 +0000
+ -- Rene Engelhard <rene@debian.org> Mon, 24 Feb 2014 21:44:46 +0100
libreoffice (1:4.1.5-1) unstable; urgency=low
diff --git a/control b/control
index 2338df5..bd3ce5b 100644
--- a/control
+++ b/control
@@ -4430,7 +4430,7 @@ Package: libreoffice-mysql-connector
Section: misc
Architecture: amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Suggests: mysql-server (>= 5.1)
+Suggests: mariadb-server | mysql-server (>= 5.1)
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 c0f99f6..79af47b 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: mysql-server (>= 5.1)
+Suggests: mariadb-server | mysql-server (>= 5.1)
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: