Initial packaging for 5.4.0.

diff --git a/debian/control b/debian/control
index c58c2d2ddc130cd23c7b8f2efe76f5b441a21d93..22031ebe2262311c896304c488a14c7c94192120 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,10 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libglib2.0-dev,
  libhal-dev,
  libkvm-dev [kfreebsd-any],
+ liblvm2-dev,
  libmemcached-dev,
  libmodbus-dev,
+ libmnl-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -29,6 +31,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  librabbitmq-dev,
  librrd-dev (>= 1.4~),
  libsensors4-dev [linux-any],
+# libsigrok-dev,
 # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
@@ -87,6 +90,7 @@ Description: statistics collection and monitoring daemon (core system)
    * Ascent server statistics: ascent
    * battery status: battery
    * bind9 name-server and zone statistics: bind
+   * CGroups resource usage: cgroups
    * connection tracking table size: conntrack
    * number of context switches done by the operating system: contextswitch
    * CPU utilization: cpu
@@ -116,6 +120,7 @@ Description: statistics collection and monitoring daemon (core system)
    * CPU, disk, network statistics of guest systems: libvirt
    * system load averages: load
    * logging to files, STDOUT and STDERR: logfile
+   * Logical Volume Manager usage: lvm
    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
    * Query and parse data from a memcache daemon: memcachec
@@ -149,10 +154,12 @@ Description: statistics collection and monitoring daemon (core system)
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
    * values from SNMP enabled network devices: snmp
+   * aggregate values received with the StatsD protocol: statsd
    * swap usage: swap
    * logging to syslog: syslog
    * parse table-like structured files: table
    * incremental parsing of logfiles: tail
+   * incremental parsing of CSV files: tail_csv
    * number of TCP connections to specific ports: tcpconns
    * TeamSpeak2 server statistics: teamspeak2
    * power consumption measurements from "The Energy Detective" (TED): ted
@@ -167,7 +174,9 @@ Description: statistics collection and monitoring daemon (core system)
    * detailed virtual memory statistics: vmem
    * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
+   * send collected values to a graphite server: write_graphite
    * send collected values to a web-server: write_http
+   * send collected values to a riemann server: write_riemann
 
 Package: collectd
 Architecture: any

diff --git a/debian/rules b/debian/rules
index af70f20dc99c346a4e4cc896643194aa948b98b2..e71ee5156649fa8605272fb5ea824ff976963cc6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,9 @@ confflags += --disable-lpar
 # Solaris only (requires devinfo and kstat)
 confflags += --disable-tape
 
+# libmic is required for the mic plugin
+confflags += --disable-mic
+
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp
 
@@ -80,6 +83,9 @@ confflags += --disable-redis --disable-write_redis
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
+# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
+confflags += --disable-sigrok
+
 # libmongoc is required for the write_mongodb plugin.
 confflags += --disable-write_mongodb
 
@@ -89,12 +95,6 @@ confflags += --disable-xmms
 # libkstat is required for the xfs_arc plugin.
 confflags += --disable-zfs-arc
 
-# The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637, #419684 and #524593 for more details).
-ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))
-       confflags += --disable-netlink
-endif
-
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
@@ -220,14 +220,6 @@ install-arch: build
        rm -f debian/tmp/usr/lib/libcollectdclient.la
        rm -f debian/tmp/etc/collectd.conf
        
-       # this was broken by passing INSTALL_BASE rather than PREFIX to
-       # Makefile.PL
-       install -d -m 755 debian/tmp/usr/share/man/man3
-       mv debian/tmp/usr/man/man3/Collectd::Unixsock.3pm \
-               debian/tmp/usr/share/man/man3/
-       install -d -m 755 debian/tmp/usr/share/
-       mv debian/tmp/usr/lib/perl5 debian/tmp/usr/share/
-       
        dh_install -a --sourcedir=$(CURDIR)/debian/tmp --fail-missing
        
        perl ./debian/bin/gen_plugin_deps.pl