From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 26 Apr 2014 14:53:09 +0000 (+0200)
Subject: Build-depend on libow-dev and re-enable the onewire plugin.
X-Git-Tag: collectd-5.4.1-2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c41fb6df2047436eafa0a3c434c38527e12c8d30;p=pkg-collectd.git

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 d69f827..7312772 100644
--- 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 a9ee986..1300a72 100644
--- 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 094a50b..11ef4cc 100755
--- 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