debian/: Corrected the files needed for building Debian packages.

diff --git a/debian/changelog b/debian/changelog
index 44def5a6b696c28da560ad0178936f2c91ab2554..27650924e0f1184c4d467defa6247de5c7501dee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-collectd (3.10.0) unstable; urgency=low
+collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream version
 

diff --git a/debian/control b/debian/control
index 69918a519775db00e94232fe5ce7c8f1a93520d7..3ee102e44d5017fe929c475119189872988dbe11 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Florian Forster <octo@verplant.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, librrd0-dev | librrd2-dev, libsensors-dev, libmysqlclient14-dev, libcurl3-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, librrd0-dev | librrd2-dev, libsensors-dev, libmysqlclient14-dev, libcurl3-dev, liboping-dev
 Standards-Version: 3.6.1
 
 Package: collectd

diff --git a/debian/rules b/debian/rules
index 5ae576194645d6081fa76909c818f7bf70097f0d..de41de1871a07ecdca27b19fad2bc9cf035d5f2f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,8 +73,6 @@ install: build
 
        # Add here commands to install the package into debian/collectd.
        $(MAKE) DESTDIR=$(CURDIR)/debian/collectd install
-       mkdir -p $(CURDIR)/debian/collectd/etc
-       cp contrib/collectd.conf $(CURDIR)/debian/collectd/etc/
        rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.a  || true
        rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.la || true