Reenabled and fixed the work around for #474087.

[pkg-collectd.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 11f5c05efeb0e3a7ebed41eb1891a0c000c12c76..a3a41b340ff346c63d616560292011d7cdd5613d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ endif
 
 # Force the inclusion of the ipmi plugin and manually specify its
 # dependencies to work around #474087 (broken openipmi .pc files).
-BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread
+BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI
 confflags += --enable-ipmi
 
 config.status: configure $(DPATCH_STAMPFN)
@@ -80,6 +80,7 @@ clean: unpatch
        [ ! -f Makefile ] || $(MAKE) distclean
        
        rm -f debian/README.Debian.plugins
+       rm -f src/*.1 src/*.5
        
        dh_clean 
        debconf-updatepo
@@ -132,7 +133,7 @@ binary-indep: install-indep
        dh_installdocs -A -i debian/README.Debian AUTHORS README TODO
        dh_installexamples -i contrib/examples/myplugin.c \
                contrib/examples/MyPlugin.pm
-       dh_compress -i -Xexamples/myplugin.c -Xexamples/MyPlugin.pm
+       dh_compress -i -Xexamples/
        dh_fixperms -i
        dh_installdeb -i
        dh_gencontrol -i
@@ -146,6 +147,7 @@ binary-arch: build install-arch
        dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
        dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins
        dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
+               contrib/collection3/ \
                contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \
                contrib/exec-nagios.conf contrib/exec-nagios.px \
                contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
@@ -154,7 +156,7 @@ binary-arch: build install-arch
        dh_installinit -a -- defaults 95
        dh_link -a
        dh_strip -a --dbg-package=collectd-dbg
-       dh_compress -a
+       dh_compress -a -Xexamples/
        dh_fixperms -a
        dh_installdeb -a
        dpkg-shlibdeps -Tdebian/collectd.substvars \