Revert "control: update mysql-related package names"

This reverts commit e5a36c5c683025657e014ed7e278e62b420a121e.

diff --git a/debian/changelog b/debian/changelog
index 815843373b7fefa87349769deb39690a200951c7..f8e2081fbe42d85c3c2576942e63baed4ac1987c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 collectd (5.6.1-2~bpo8+1) UNRELEASED; urgency=medium
 
   * Rebuild for jessie-backports.
+  * debian/control:
+    - Revert mysql-related package names back to libmysqlclient-dev and
+      mysql-server.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 23 Nov 2016 22:33:13 +0100
 

diff --git a/debian/control b/debian/control
index 206e36b6adc39076eb19400e8d06b2ba73e2ab70..1d69549b57dfa3719c11173e452590543940284e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Sebastian Harl <tokkee@debian.org>
 Uploaders: Marc Fournier <marc@bl.uem.li>
 Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
- default-libmysqlclient-dev,
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
  kfreebsd-kernel-headers [kfreebsd-any],
@@ -30,6 +29,7 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libmodbus-dev,
  libmosquitto-dev,
  libmnl-dev [linux-any],
+ libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
  liboping-dev (>= 0.3.3),
@@ -76,10 +76,9 @@ Suggests: collectd-dev,
  librrds-perl, liburi-perl, libhtml-parser-perl, libregexp-common-perl,
  libconfig-general-perl, httpd-cgi,
 # services providing data that may be collected by collectd
- apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd, hddtemp,
- iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon,
- nut, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
- time-daemon, varnish, zookeeper,
+ apache2, apcupsd, bind9, ceph, chrony, gpsd, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
+ memcached, mysql-server | virtual-mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
+ pdns-server, postgresql, redis-server, slapd, time-daemon, varnish, zookeeper,
  ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
 Description: statistics collection and monitoring daemon (core system)