Reenabled and fixed the work around for #474087.

[pkg-collectd.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 98a6acba59ecc84a5ef1b497b5fac62bb0022bce..a3a41b340ff346c63d616560292011d7cdd5613d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,10 +40,11 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
-# The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637 and #419684 for more details).
+# The static libraries netstat and upsclient cannot be linked into shared
+# objects on some architectures (see bugs #358637 and #419684 for more
+# details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
-       confflags += --disable-netlink
+       confflags += --disable-netlink --disable-nut
 endif
 
 # libvirt is only available on amd64, i386 and powerpc.
@@ -53,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)
@@ -79,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
@@ -131,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
@@ -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 \