summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae68bef)
raw | patch | inline | side by side (parent: ae68bef)
author | Sebastian Harl <tokkee@io.debian.net> | |
Sat, 23 Jan 2010 15:39:41 +0000 (15:39 +0000) | ||
committer | Sebastian Harl <tokkee@io.debian.net> | |
Sat, 23 Jan 2010 15:41:06 +0000 (15:41 +0000) |
iproute is only available on Linux.
debian/changelog | patch | blob | history | |
debian/control | patch | blob | history | |
debian/rules | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 23ad8faa55c605858f36216e0af531b791766a9c..0390c17a066c90160651cb00be0f3e5fdc9dfa3f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
* debian/collectd-core.install:
- Install all collectd-*.5 manpages (in particular, this includes the
newly added collectd-python.5).
+ * debian/control, debian/rules:
+ - Disabled the "netlink" plugin on kfreebsd-{i386,amd64} and do not
+ build-depend on iproute-dev -- iproute is only available on Linux.
- -- Sebastian Harl <tokkee@debian.org> Sun, 27 Dec 2009 02:10:29 +0100
+ -- Sebastian Harl <tokkee@debian.org> Sat, 23 Jan 2010 15:38:38 +0000
collectd (4.8.2-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f9b0296e019c511508b3c86f22c66ddc991459c7..8ae88ac2e3661b2bdf1fef0acf2b0266c31d3913 100644 (file)
--- a/debian/control
+++ b/debian/control
Maintainer: Sebastian Harl <tokkee@debian.org>
Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
bison, flex, autotools-dev, libltdl-dev, pkg-config,
- iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
+ iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64],
iptables-dev (>= 1.4.3.2-2),
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
diff --git a/debian/rules b/debian/rules
index a55d09c862ccb508219760087b2c2150401d1b0d..281c8ae2ee38c37699f2ca1b7e8ba9888795eccf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
# The static library netstat cannot be linked into shared objects on some
# architectures (see bugs #358637, #419684 and #524593 for more details).
-ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
+ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips \
+ mipsel kfreebsd-i386 kfreebsd-amd64))
confflags += --disable-netlink
endif