Added new binary package collectd-utils.

This package currently only includes collectd-nagios. collectd-nagios now
links against libcollectdclient. By putting it into its own package, we avoid
pulling in a dependency on libcollectdclient0 in the collectd binary package.

diff --git a/debian/changelog b/debian/changelog
index d2317f38ae4b34342e1c93b330bd088fa35e30f9..9176593d36d8449bedb3e570944c3d1ef0fa7e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ collectd (4.6.0-1) unstable; urgency=low
     - Removed perl-uninitialized-var.dpatch - included upstream.
   * debian/control:
     - Added new binary packages libcollectdclient0 and libcollectdclient-dev.
+    - Added new binary package collectd-utils.
   * debian/rules:
     - Use dh_install and *.install files to specify which package some file
       belongs to.
@@ -35,7 +36,7 @@ collectd (4.6.0-1) unstable; urgency=low
     - Override "spelling-error-in-description" for the apache plugin name -
       all plugins are spelled lowercase.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Feb 2009 17:10:11 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Feb 2009 17:59:43 +0100
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/collectd-utils.install b/debian/collectd-utils.install
new file mode 100644 (file)
index 0000000..e8985ba
--- /dev/null
+++ b/debian/collectd-utils.install
@@ -0,0 +1,3 @@
+usr/bin/collectd-nagios
+usr/share/man/man1/collectd-nagios.1
+

diff --git a/debian/collectd.install b/debian/collectd.install
index 8a3c55c1d35909ef50a00e5a29341489e2d43e0f..e668fe717c60b24e5e36ae96782f70a6ca9ba7ba 100644 (file)
--- a/debian/collectd.install
+++ b/debian/collectd.install
@@ -1,11 +1,19 @@
 ../../contrib/migrate-3-4.px usr/lib/collectd/utils
 ../../contrib/rrd_filter.px usr/lib/collectd/utils
 ../collectd.conf ../collection.conf ../thresholds.conf etc/collectd/
-usr/bin
 usr/lib/collectd/*.so
 usr/sbin
 usr/share/collectd
-usr/share/man
+usr/share/man/man1/collectdmon.1
+usr/share/man/man1/collectd.1
+usr/share/man/man3/Collectd::Unixsock.3pm
+usr/share/man/man5/collectd-unixsock.5
+usr/share/man/man5/collectd-email.5
+usr/share/man/man5/collectd-exec.5
+usr/share/man/man5/collectd.conf.5
+usr/share/man/man5/collectd-snmp.5
+usr/share/man/man5/collectd-perl.5
+usr/share/man/man5/types.db.5
 usr/share/perl5
 var
 

diff --git a/debian/control b/debian/control
index d891a49954b7a90516cc059837a6c5bead1e027d..10c04b5d33a04529efd3e8f50217fdc21fe232e3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -93,6 +93,22 @@ Description: statistics collection and monitoring daemon
    * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
 
+Package: collectd-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: collectd
+Suggests: nagios3 | nagios2
+Description: statistics collection and monitoring daemon (utilities)
+ collectd is a small daemon which collects system information periodically and
+ provides mechanisms to monitor and store the values in a variety of ways.
+ Since the daemon doesn't need to startup every time it wants to update the
+ values it's very fast and easy on the system. Also, the statistics are very
+ fine grained since the files are updated every 10 seconds by default.
+ .
+ This package contains the following utility:
+ .
+   * collectd-nagios: Nagios plugin for querying collectd
+
 Package: collectd-dbg
 Architecture: any
 Priority: extra