[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/02: * debian/control.mysql.in: add default-mysql-server as first alternative to the Suggests



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

rene pushed a commit to branch master
in repository libreoffice.

commit 6d7fb5bc9f4e0d99d3173c3eed542cdfc9cbac2e
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Aug 16 04:16:58 2016 +0200

    * debian/control.mysql.in: add default-mysql-server as first alternative to the Suggests
---
 changelog        | 4 +++-
 control          | 2 +-
 control.mysql.in | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 355a565..02bf377 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,10 @@ 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)
+  * debian/control.mysql.in: add default-mysql-server as first alternative
+    to the Suggests
 
- -- Rene Engelhard <rene@debian.org>  Mon, 15 Aug 2016 09:28:42 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 16 Aug 2016 04:08:56 +0200
 
 libreoffice (1:5.2.0-2) unstable; urgency=medium
 
diff --git a/control b/control
index 5d745e8..5667310 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: mariadb-server | mysql-server (>= 5.1)
+Suggests: default-mysql-server | 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 79af47b..95c8bfa 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: mariadb-server | mysql-server (>= 5.1)
+Suggests: default-mysql-server | 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: