Merged all plugin binary packages into the "collectd" binary package.

 * collectd now conflicts, provides, replaces all plugin binary packages
 * updated debian/rules

diff --git a/debian/control b/debian/control
index 8818133803b4a5462308bad4eb6f9870a8a4ca92..6215d450484feaa3fa6d87e8211c7a0604be8d3f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,14 @@ Package: collectd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: perl, rrdtool, ${shlibs:Recommends}
-Suggests: collectd-apache, collectd-mysql, collectd-sensors, collectd-dev,
- collectd-ping, collectd-dns, collectd-perl, librrds-perl, liburi-perl,
- libhtml-parser-perl, httpd-cgi, hddtemp, mbmon
-Provides: collectd-hddtemp
-Replaces: collectd-hddtemp
+Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl,
+ httpd-cgi, hddtemp, mbmon
+Conflicts: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
+ collectd-perl, collectd-ping, collectd-sensors
+Provides: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
+ collectd-perl, collectd-ping, collectd-sensors
+Replaces: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
+ collectd-perl, collectd-ping, collectd-sensors
 Description: statistics collection daemon
  collectd is a small daemon which collects system information periodically and
  provides mechanismns to store the values in a variety of ways. It is written
@@ -26,6 +29,7 @@ Description: statistics collection daemon
  seconds.
  .
  This package contains the main program file and the following plugins:
+   * Apache and lighttpd statistics provided by mod_status: apache
    * APC UPS's charge, load, input/output/battery voltage, etc.: apcups
    * battery status: battery
    * CPU utilization: cpu
@@ -33,6 +37,7 @@ Description: statistics collection daemon
    * output to comma separated values (CSV) files: csv
    * disk space usage: df
    * disk and partition throughput: disk
+   * DNS traffic information: dns
    * E-Mail statistics (count, traffic, spam scores and checks): email
    * amount of available entropy: entropy
    * execution of external programs: exec
@@ -45,12 +50,16 @@ Description: statistics collection daemon
    * motherboard monitor: mbmon
    * memory usage: memory
    * multimeter statistics: multimeter
+   * MySQL statistics provided by MySQL's "show status" command: mysql
    * IO via the network: network
    * NFS utilization: nfs
    * NTP daemon's local clock drift, offset to peers, etc.: ntpd
    * UPS information: nut
    * number of processes: processes
    * output to RRD files: rrdtool
+   * embedded Perl interpreter: perl
+   * network latency statistics: ping
+   * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
    * swap usage: swap
    * logging to syslog: syslog
@@ -65,10 +74,7 @@ Package: collectd-dbg
 Section: utils
 Architecture: any
 Priority: extra
-Depends: collectd (= ${binary:Version}), collectd-apache (= ${binary:Version}),
- collectd-dns (= ${binary:Version}), collectd-mysql (= ${binary:Version}),
- collectd-perl (= ${binary:Version}), collectd-ping (= ${binary:Version}), 
- collectd-sensors (= ${binary:Version})
+Depends: collectd (= ${binary:Version})
 Description: statistics collection daemon (debugging symbols)
  collectd is a small daemon which collects system information periodically and
  provides mechanismns to store the values in a variety of ways. It is written
@@ -79,96 +85,6 @@ Description: statistics collection daemon (debugging symbols)
  .
  This package contains the debugging symbols.
 
-Package: collectd-apache
-Architecture: any
-Depends: collectd (= ${binary:Version}), ${shlibs:Depends}
-Description: statistics collection daemon (Apache plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 Apache plugin which collects Apache and lighttpd
- statistics provided by mod_status.
-
-Package: collectd-dns
-Architecture: any
-Depends: collectd (= ${binary:Version}), ${shlibs:Depends}
-Description: statistics collection daemon (DNS plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 DNS plugin which collects DNS traffic information
- (query types, response codes, opcodes and traffic).
-
-Package: collectd-hddtemp
-Architecture: any
-Depends: collectd (= ${binary:Version})
-Description: statistics collection daemon (hddtemp plugin transitional package)
- Empty package to facilitate upgrades. It can be safely removed.
-
-Package: collectd-mysql
-Architecture: any
-Depends: collectd (= ${binary:Version}), ${shlibs:Depends}
-Description: statistics collection daemon (MySQL plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 MySQL plugin which collects MySQL statistics
- provided by MySQL's "show status" command.
-
-Package: collectd-perl
-Architecture: any
-Depends: collectd (= ${binary:Version}), ${shlibs:Depends}
-Description: statistics collection daemon (perl plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 (= ${binary:Version}), ${shlibs:Depends}
-Description: statistics collection daemon (ping plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 ping plugin which collects network latency
- statistics.
-
-Package: collectd-sensors
-Architecture: any
-Depends: collectd (= ${binary:Version}), lm-sensors, ${shlibs:Depends}
-Description: statistics collection daemon (sensors plugin)
- collectd is a small daemon which collects system information periodically and
- provides mechanismns to store the values in a variety of ways. It is written
- in C for performance. 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 sensors plugin which collects lm_sensors
- information (e.g. CPU temperature, fan speeds).
-
 Package: collectd-dev
 Architecture: all
 Depends: collectd (>= ${source:Version}), collectd (<< 4.2~)

diff --git a/debian/rules b/debian/rules
index 8ed8f6c68c681c16829d2c483eb066038ca77dba..d616426a1944b8561f7a4a271efcb92d6bb3e46e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -87,20 +87,6 @@ install-arch: build
        install -m 0644 debian/collection.conf \
                debian/collectd/etc/collectd/collection.conf
        
-       for PLUGIN in apache dns mysql perl ping sensors; do \
-               plugin_dir=debian/collectd-$$PLUGIN/usr/lib/collectd/; \
-               manpage=debian/collectd/usr/share/man/man5/collectd-$$PLUGIN.5; \
-               man_dir=debian/collectd-$$PLUGIN/usr/share/man/man5/; \
-               \
-               mkdir -p $$plugin_dir; \
-               mv debian/collectd/usr/lib/collectd/$$PLUGIN.so $$plugin_dir; \
-               \
-               if [ -e $$manpage ]; then \
-                       mkdir -p $$man_dir; \
-                       mv $$manpage $$man_dir; \
-               fi \
-       done
-       
        mkdir -p debian/collectd/usr/lib/collectd/utils/
        for UTIL in extractDS.px migrate-3-4.px; do \
                cp contrib/$$UTIL debian/collectd/usr/lib/collectd/utils/; \