[pkg-bacula-commits] [bacula] 02/02: Use the new default-mysql-* metapackages in dependencies

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit 7660366cc202fd470f5ced1b49b9437186a57096
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Oct 19 12:51:03 2016 +0200

    Use the new default-mysql-* metapackages in dependencies
---
 debian/TODO      | 3 ---
 debian/changelog | 1 +
 debian/control   | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index ff96ca4..75eb540 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,9 +2,6 @@ High:
 
  * Look into the build problems with OpenSSL 1.1.0
    - reported upstream: http://bugs.bacula.org/view.php?id=2247
- * Debian default change: MySQL->MariaDB
-   https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
-   - wait for outcome of current discussion on debian-devel
 
 Normal:
 
diff --git a/debian/changelog b/debian/changelog
index bbf0798..2ee809a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 bacula (7.4.4+dfsg-2) unstable; urgency=medium
 
   * Added version to Depends on lsb-base (found by lintian)
+  * Use the new default-mysql-* metapackages in dependencies
 
  --
 
diff --git a/debian/control b/debian/control
index fa4e1f6..ad1929c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libgtk2.0-dev,
  libkrb5-dev,
  liblzo2-dev,
- libmysqlclient-dev,
+ default-libmysqlclient-dev,
  libpq-dev (>= 9.1),
  libqt4-dev,
  libreadline-dev,
@@ -169,13 +169,13 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  bacula-common-mysql (= ${binary:Version}),
  dbconfig-mysql | dbconfig-no-thanks,
- mysql-client | virtual-mysql-client,
+ default-mysql-client | virtual-mysql-client,
  ucf,
  ${misc:Depends},
 Conflicts: bacula-director-database
 Provides: bacula-director-database
 Replaces: bacula-director-database
-Recommends: mysql-server | virtual-mysql-server
+Recommends: default-mysql-server | virtual-mysql-server
 Suggests: gawk, ${perl:Depends}
 Description: network backup service - MySQL storage for Director
  Bacula is a set of programs to manage backup, recovery, and verification of

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