Updated to collectd-4.0.0~rc6.

* Updated changelog to collectd-4.0.0~rc6-1.
* Added collectd-perl binary package.
* Added iptables-dev, nut-dev and libperl-dev build dependencies.
* Enabled debugging.

diff --git a/debian/changelog b/debian/changelog
index 5b55321cf57215781ab6e1aa1a73c482adc11796..aee56b697471476cd1a0dee2c8ba424b8e9c7b72 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+collectd (4.0.0~rc6-1) experimental; urgency=low
+
+  * New upstream release.
+    - Rewrite of the plugin system to allow more flexibility by using
+      different types of plugins.
+    - Added Nagios plugin to query collectd from Nagios.
+    New plugins:
+    - Output to "comma separated values" (CSV) files: csv
+    - Output to RRD files: rrdtool
+    - IO via the network: network
+    - External runtime interface: unixsock
+    - Embedding a Perl interpreter: perl
+    - Logging to files, STDOUT or STDERR: logfile
+    - Logging to syslog: syslog
+    - Amount of available entropy: entropy
+    - Execution of external programs: exec
+    - Iptables statistics: iptables (32bit systems only)
+    - IRQ counters: irq
+    - UPS information: nut (32bit systems only)
+  * New binary package collectd-perl (linking against libperl).
+    - Added collectd-perl to suggested packages.
+  * examples/myplugin.c: Converted to the new plugin interface.
+  * Enabled debugging as this is an experimental release candidate.
+
+ -- Sebastian Harl <sh@tokkee.org>  Tue, 24 Apr 2007 10:44:26 +0200
+
 collectd (3.11.2-1) experimental; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 9b1891128f184ae64c553f88a6416414fb642d96..e14ee3734ea7208b7fec2781fced63c2336b4919 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev, iptables-dev [!amd64 !ia64 !ppc64], nut-dev [!amd64 !ia64 !ppc64], libperl-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.7.2
 
@@ -10,7 +10,7 @@ Package: collectd
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: collectd-apache, collectd-mysql, collectd-sensors, collectd-dev,
- collectd-ping, collectd-dns, librrds-perl, hddtemp, mbmon
+ collectd-ping, collectd-dns, collectd-perl,librrds-perl, hddtemp, mbmon
 Provides: collectd-hddtemp
 Replaces: collectd-hddtemp
 Description: statistics collection daemon
@@ -108,6 +108,19 @@ Description: statistics collection daemon (MySQL plugin)
  This package contains the MySQL plugin which collects MySQL statistics
  provided by MySQL's "show status" command.
 
+Package: collectd-perl
+Architecture: any
+Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
+Description: statistics collection daemon (perl plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the perl plugin which embeds a Perl interpreter adding
+ the possibility to write collectd plugins in Perl.
+
 Package: collectd-ping
 Architecture: any
 Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
@@ -136,7 +149,7 @@ Description: statistics collection daemon (sensors plugin)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd (>= ${Source-Version}), collectd (<< 3.12~)
+Depends: collectd (>= ${Source-Version}), collectd (<< 4.1~)
 Description: statistics collection daemon (development files)
  collectd is a small daemon written in C for performance. It reads various
  system statistics and updates RRD files, creating them if necessary. Since

diff --git a/debian/rules b/debian/rules
index 22a2b8562c9eaa45347a754ddae8f6b2b64d1ae7..21e2e3e6625019b2aa344faca66df71c39e6a803 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
@@ -19,12 +20,21 @@ else
        CFLAGS += -O2
 endif
 
-config.status: configure
-       dh_testdir
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+confflags = --host=$(DEB_HOST_GNU_TYPE) \
                        --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
                        --mandir=\$${prefix}/share/man \
-                       --localstatedir=/var --sysconfdir=/etc
+                       --localstatedir=/var --sysconfdir=/etc \
+                       --enable-debug
+
+# The static libraries iptc and upsclient cannot be used on 64bit systems
+# (see bugs #358637 and #419684 for more details).
+ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 ia64 ppc64))
+       confflags += --disable-iptables --disable-nut
+endif
+
+config.status: configure
+       dh_testdir
+       CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
 build: build-stamp
 
@@ -68,7 +78,7 @@ install-arch: build
        install -D -m 0644 $(CURDIR)/debian/collectd.conf \
                $(CURDIR)/debian/collectd/etc/collectd/collectd.conf
        
-       for PLUGIN in apache dns mysql ping sensors; do \
+       for PLUGIN in apache dns mysql perl ping sensors; do \
                plugin_dir=$(CURDIR)/debian/collectd-$$PLUGIN/usr/lib/collectd/; \
                mkdir -p $$plugin_dir; \
                mv $(CURDIR)/debian/collectd/usr/lib/collectd/$$PLUGIN.so \
@@ -94,7 +104,8 @@ binary-arch: build install-arch
        dh_installchangelogs -a ChangeLog
        dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
        dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
-               contrib/SpamAssassin/
+               contrib/PerlLib/ contrib/SpamAssassin/ contrib/iptables/ \
+               contrib/extractDS.px contrib/migrate-3-4.px
        dh_installinit -a -- defaults 95
        dh_installman -a src/collectd.1 src/collectd.conf.5
        dh_link -a