X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Fcontrol;h=87a3663a8688b0163530bae3bbde207ec51a860a;hb=a0f37cb36f4c0503ea09ae27368b54754b85cd47;hp=fc3637e3ed140b21af00c1697d4365f4a5679bb3;hpb=e0a51c7062f898c6accb6fd914885519505369eb;p=pkg-collectd.git

diff --git a/debian/control b/debian/control
index fc3637e..87a3663 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,55 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev (>= 1.4.3.2-2), libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev, libmemcached-dev, openjdk-6-jdk, libganglia1-dev (>= 3), libgcrypt11-dev
+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],
+ 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,
+ libesmtp-dev,
+ libganglia1-dev (>= 3),
+ libgcrypt11-dev,
+ libglib2.0-dev,
+ libhal-dev,
+ libmemcached-dev,
+ libmysqlclient-dev,
+ libnotify-dev,
+ libopenipmi-dev,
+ liboping-dev (>= 0.3.3),
+ libpcap0.8-dev | libpcap-dev,
+ libperl-dev,
+ libpq-dev,
+ librrd-dev | librrd2-dev,
+ libsensors4-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~),
+ libupsclient1-dev,
+ libvirt-dev (>= 0.4.0-6),
+ libxml2-dev,
+ libyajl-dev,
+ linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1),
+ openjdk-6-jdk [!hppa]
 Build-Conflicts: libpthread-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
 Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
 
-Package: collectd
+Package: collectd-core
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: perl, rrdtool, lm-sensors, ${shlibs:Recommends}
-Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl,
- libregexp-common-perl, libconfig-general-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 and monitoring daemon
+Recommends: perl, rrdtool, lm-sensors
+Suggests: collectd-dev,
+# collection.cgi / collection3 dependencies
+ librrds-perl, liburi-perl, libhtml-parser-perl, libregexp-common-perl,
+ libconfig-general-perl, httpd-cgi,
+# services providing data that may be collected by collectd
+ hddtemp, mbmon,
+ ${shlibs:Suggests}
+Replaces: collectd (<< 4.8.1-2~)
+Description: statistics collection and monitoring daemon (core system)
  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
@@ -31,9 +60,13 @@ Description: statistics collection and monitoring daemon
  The collected information can be used to find current performance bottlenecks
  (performance analysis) and predict future system load (capacity planning).
  .
- This package contains the main program file and the following plugins (some
+ This package contains the main program file and the plugins listed below (some
  of those plugins require additional libraries - for more details see
- /usr/share/doc/collectd/README.Debian.plugins):
+ /usr/share/doc/collectd-core/README.Debian.plugins) but no configuration. For
+ a full installation (including configuration), see the "collectd" package.
+ This package allows sites to, e.g., provide customizations (like a custom
+ default configuration) on top of it without having to modify the "collectd"
+ package.
  .
    * Apache and lighttpd statistics provided by mod_status: apache
    * APC UPS's charge, load, input/output/battery voltage, etc.: apcups
@@ -45,6 +78,7 @@ Description: statistics collection and monitoring daemon
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
+   * parse JSON files: curl_json
    * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk
@@ -54,6 +88,7 @@ Description: statistics collection and monitoring daemon
    * execution of external programs: exec
    * count the number of files in directories: filecount
    * Linux file-system based caching framework statistics: fscache
+   * query data from Java processes using JMX: GenericJMX (Java based plugin)
    * Receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * network traffic: interface
@@ -65,6 +100,7 @@ Description: statistics collection and monitoring daemon
    * CPU, disk, network statistics of guest systems: libvirt
    * system load averages: load
    * logging to files, STDOUT and STDERR: logfile
+   * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
    * Query and parse data from a memcache daemon: memcachec
    * statistics of the memcached distributed caching system: memcached
@@ -80,6 +116,7 @@ Description: statistics collection and monitoring daemon
    * NTP daemon's local clock drift, offset to peers, etc.: ntpd
    * UPS information: nut
    * OpenVPN traffic and compression statistics: openvpn
+   * Optimized Link State Routing daemon statistics: olsrd
    * PostgreSQL database statistics: postgresql
    * PowerDNS name server statistics: powerdns
    * number of processes: processes
@@ -105,6 +142,26 @@ Description: statistics collection and monitoring daemon
    * detailed virtual memory statistics: vmem
    * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
+   * send collected values to a web-server: write_http
+
+Package: collectd
+Architecture: any
+Depends: collectd-core, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${shlibs:Recommends}
+Description: statistics collection and monitoring daemon
+ 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.
+ .
+ The collected information can be used to find current performance bottlenecks
+ (performance analysis) and predict future system load (capacity planning).
+ .
+ This package provides a full installation of the daemon, including the
+ configuration. For the core system, see the "collectd-core" package, which
+ allows sites to, e.g., provide customizations (like a custom default
+ configuration) on top of it without having to modify the "collectd" package.
 
 Package: collectd-utils
 Architecture: any
@@ -127,7 +184,7 @@ Package: collectd-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: collectd (= ${binary:Version}), ${misc:Depends}
+Depends: collectd-core (= ${binary:Version}), ${misc:Depends}
 Recommends: collectd-utils (= ${binary:Version}),
  libcollectdclient0 (= ${binary:Version})
 Description: statistics collection and monitoring daemon (debugging symbols)
@@ -141,7 +198,8 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd (>= ${source:Version}), collectd (<< 4.8~), ${misc:Depends}
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.9~),
+ ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.