From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 7 Sep 2007 13:37:21 +0000 (+0200)
Subject: Merge collectd-3.10.4-1 into bpo branch.
X-Git-Tag: collectd-4.3.0-2--bpo40+1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=428849fecf770385095200dfdab23953c4cc8f4e;p=pkg-collectd.git

Merge collectd-3.10.4-1 into bpo branch.
---

428849fecf770385095200dfdab23953c4cc8f4e
diff --cc debian/control
index 7eb9032,41eb193..f46bad2
--- a/debian/control
+++ b/debian/control
@@@ -2,8 -2,7 +2,8 @@@ Source: collect
  Section: utils
  Priority: optional
  Maintainer: Sebastian Harl <sh@tokkee.org>
- Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev,
 -Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3)
++Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-dev,
 + libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3)
  Standards-Version: 3.7.2
  
  Package: collectd