Build-depend on libow-dev and re-enable the onewire plugin.

Thanks to Adam Smutnicki for pointing this out.
Closes: #744956

diff --git a/debian/changelog b/debian/changelog
index d69f8270941dcd237b05e4457ea0f6b624dd05a5..73127727b2249b26e0f8eec4e99045e5f28d5073 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
 collectd (5.4.1-2) UNRELEASED; urgency=medium
 
-  * debian/rules:
+  * debian/rules, debian/control:
     - Disable varnish for now; it does not work with varnish 4;
       c.f. https://bugs.debian.org/745902 (Closes: #745894).
+    - Drop build dependency on libvarnishapi-dev.
+    - Build-depend on libow-dev and re-enable the onewire plugin; thanks to
+      Adam Smutnicki for pointing this out (Closes: #744956).
+  * debian/rules:
     - Added INSTALL_BASE= to perl options; else, modules are installed
       into $HOME.
     - Prepend collectd/core to collectd's header files; thanks to Sergio
       Jimenez for reporting this (Closes: #739516).
-  * debian/control:
-    - Drop build dependency on libvarnishapi-dev.
   * debian/patches:
     - Added collection.cgi.dpatch fixing apache data-sources; thanks to
       Fabiano Pires for reporting this and providing a patch

diff --git a/debian/control b/debian/control
index a9ee986caab0fd3cb4f222b4de7e5f2f3a7048f9..1300a7234d7d1fe4efa9ce19a354bace242efe48 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libnotify-dev,
  libopenipmi-dev,
  liboping-dev (>= 0.3.3),
+ libow-dev,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,

diff --git a/debian/rules b/debian/rules
index 094a50b908dfb42a07e2f51dfdc971f01745fa66..11ef4ccdd3c3a90e013afef2717b268acb4ba6f4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -74,9 +74,6 @@ confflags += --disable-mic
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp
 
-# libowcapi is required for the onewire plugin.
-confflags += --disable-onewire
-
 # libclntsh is required for the oracle plugin.
 confflags += --disable-oracle