Merged commit 'collectd-4.10.1-1' into lenny-backports.

diff --git a/debian/changelog b/debian/changelog
index d5c81ddbc5f864033e747487cdd5ab4ccf6ad839..7c3a1c0e03b55b4861b2d2d3d4786e30ef6cb26d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,42 @@ collectd (4.10.0-1) unstable; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 08 Jun 2010 00:42:56 +0200
 
+collectd (4.9.1-2~bpo50+2) lenny-backports; urgency=low
+
+  * debian/control:
+    - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the
+      right combination of libsnmp-dev and perl, which might confuse buildds
+      on Lenny. Lenny is not affected by #559087 (see 4.8.2-1).
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 08 Apr 2010 20:05:46 +0200
+
+collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * debian/control:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+    - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is
+      not available in Lenny.
+    - Build-depend on libsensors-dev, rather than libsensors4-dev, which is
+      not available in Lenny. This limits the functionality of the "sensors"
+      plugin which does not work well with libsensors3 and lm-sensors-3
+      (Re-opens: #538795).
+  * debian/collectd.conf, debian/control, debian/rules:
+    - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is
+      not available in Lenny; removed build-dependency on libganglia-dev.
+    - Disabled the "memcachec" plugin, which requires libmemcached which is
+      not available in Lenny; removed build-dependency on libmemcached-dev.
+    - Disabled the "rrdcached" plugin, which requires rrdclient support in
+      librrd; removed version from librrd-dev build-dependency.
+    - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which
+      is not available in Lenny; removed libtokyocabinet-dev and
+      libtokyotyrant-dev build-dependencies.
+    - Disabled the "curl_json" plugin, which requires libyajl which is not
+      available in Lenny; removed libyajl-dev build-dependency.
+
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 22 Mar 2010 23:31:30 +0100
+
 collectd (4.9.1-2) unstable; urgency=low
 
   * debian/rules:
@@ -324,6 +360,40 @@ collectd (4.7.2-1) unstable; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 29 Aug 2009 12:42:15 +0200
 
+collectd (4.6.3-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * Remaining changes:
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 17:06:37 +0200
+
+collectd (4.6.3-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * debian/control:
+    - Removed dpkg-dev build-dependency - we don't care about Vcs-* and
+      Homepage fields in backports.org.
+    - Removed optional build-dependencies libcurl4-gnutls-dev, librrd-dev and
+      libsnmp-dev - they are not available in Etch and might confuse buildds.
+    - Switch back to build-depend on nut-dev - libupsclient1-dev is not
+      available in Etch and limit the "nut" plugin to [!alpha !amd64 !hppa
+      !ia64 !ppc64 !mips !mipsel].
+    - Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+    - Build-conflict with iptables-dev to force the use of the shipped libiptc
+      (this allows building the iptables plugin on all architectures).
+  * debian/control, debian/rules:
+    - Added a work around for #474087 (broken openipmi .pc files) by providing
+      a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adding
+      that path to PKG_CONFIG_PATH. Removed the version from the
+      libopenipmi-dev build dependency - Etch does not include a fixed version
+      of openipmi.
+    - Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
+      libdbi is not available on Etch.
+
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 13:52:04 +0200
+
 collectd (4.6.3-1) unstable; urgency=low
 
   * New upstream release.
@@ -476,6 +546,25 @@ collectd (4.5.1-1) experimental; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri, 12 Dec 2008 10:09:48 +0100
 
+collectd (4.4.2-3~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev, librrd-dev and
+    libsnmp-dev - they are not available in Etch and might confuse buildds.
+  * Switch back to build-depend on nut-dev - libupsclient1-dev is not
+    available in Etch:
+    - Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64].
+  * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+  * Build-conflict with iptables-dev to force the use of the shipped libiptc
+    (this allows building the iptables plugin on all architectures).
+  * Reenabled and fixed the work around for #474087 (broken openipmi .pc
+    files) and removed the version from the libopenipmi-dev build dependency -
+    Etch does not include a fixed version of openipmi.
+
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Dec 2008 11:10:56 +0100
+
 collectd (4.4.2-3) unstable; urgency=low
 
   * New debconf template translation:
@@ -541,6 +630,23 @@ collectd (4.4.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 19:58:58 +0200
 
+collectd (4.4.1-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Switch back to build-depend on nut-dev - libupsclient1-dev is not
+    available in Etch:
+    - Limit the "nut" plugin to [!alpha !amd64 !hppa !ia64 !ppc64].
+  * No longer remove version from libvirt-dev build-dependency - a version
+    with Xen support is now available on backports.org.
+  * Replaced linux-libc-dev build-dependency with linux-kernel-headers.
+  * Build-conflict with iptables-dev to force the use of the shipped libiptc.
+
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 20 Aug 2008 10:52:14 +0200
+
 collectd (4.4.1-2) unstable; urgency=low
 
   * Restrict libcurl4-gnutls-dev build dependency to versions which are not
@@ -588,6 +694,19 @@ collectd (4.4.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Tue, 17 Jun 2008 10:35:51 +0200
 
+collectd (4.3.2-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+  * Reenabled the "iptables" plugin - libiptc is available in Etch.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Apr 2008 16:48:59 +0200
+
 collectd (4.3.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -608,6 +727,18 @@ collectd (4.3.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Mon, 31 Mar 2008 12:13:18 +0200
 
+collectd (4.3.0-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch.
+  * Removed dpkg-dev build-dependency - we don't care about Vcs-* and Homepage
+    fields in backports.org.
+  * Removed optional build-dependencies libcurl4-gnutls-dev and libsnmp-dev -
+    they are not available in Etch and might confuse buildds.
+  * Removed version from libvirt-dev build-dependency - a version with Xen
+    support is currently not available on backports.org.
+
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 27 Mar 2008 13:13:13 +0100
+
 collectd (4.3.0-2) unstable; urgency=low
 
   * Added "lm-sensors" to the recommended packages and README.Debian.plugins
@@ -822,6 +953,12 @@ collectd (3.10.2-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Fri,  3 Nov 2006 15:18:17 +0000
 
+collectd (3.10.1-4~bpo.1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Oct 2006 10:50:22 +0000
+
 collectd (3.10.1-4) unstable; urgency=low
 
   * Changed collectd-dbg's section and priority to "devel" and "extra"
@@ -831,6 +968,13 @@ collectd (3.10.1-4) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Thu,  5 Oct 2006 10:25:07 +0000
 
+collectd (3.10.1-2bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun,  6 Aug 2006 14:17:57 +0200
+
 collectd (3.10.1-3) unstable; urgency=low
 
   * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).
@@ -854,6 +998,13 @@ collectd (3.10.1-1) unstable; urgency=low
 
  -- Sebastian Harl <sh@tokkee.org>  Sat, 22 Jul 2006 21:43:37 +0200
 
+collectd (3.10.0-0bpo1) sarge-backports; urgency=low
+
+  * Rebuild for Sarge.
+  * Forcing the use of libmysqlclient14 and librrd2.
+
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 21 Jul 2006 16:23:53 +0200
+
 collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b5fc462a6ac48126122eb2b6e19cbda81851e0f0..a05694aaa0ce11ba5df14ed337327afb355d7958 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -40,7 +40,6 @@ LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
 #LoadPlugin curl
-#LoadPlugin curl_json
 #LoadPlugin curl_xml
 #LoadPlugin dbi
 LoadPlugin df
@@ -51,7 +50,6 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
@@ -63,7 +61,6 @@ LoadPlugin irq
 LoadPlugin load
 #LoadPlugin madwifi
 #LoadPlugin mbmon
-#LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin multimeter
@@ -86,7 +83,6 @@ LoadPlugin memory
 LoadPlugin processes
 #LoadPlugin protocols
 #LoadPlugin python
-#LoadPlugin rrdcached
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
@@ -98,7 +94,6 @@ LoadPlugin swap
 #LoadPlugin teamspeak2
 #LoadPlugin ted
 #LoadPlugin thermal
-#LoadPlugin tokyotyrant
 #LoadPlugin unixsock
 #LoadPlugin uptime
 LoadPlugin users
@@ -182,37 +177,6 @@ LoadPlugin users
 #      </Page>
 #</Plugin>
 
-#<Plugin curl_json>
-## See: http://wiki.apache.org/couchdb/Runtime_Statistics
-#  <URL "http://localhost:5984/_stats">
-#    Instance "httpd"
-#    <Key "httpd/requests/count">
-#      Type "http_requests"
-#    </Key>
-#
-#    <Key "httpd_request_methods/*/count">
-#      Type "http_request_methods"
-#    </Key>
-#
-#    <Key "httpd_status_codes/*/count">
-#      Type "http_response_codes"
-#    </Key>
-#  </URL>
-## Database status metrics:
-#  <URL "http://localhost:5984/_all_dbs">
-#    Instance "dbs"
-#    <Key "*/doc_count">
-#      Type "gauge"
-#    </Key>
-#    <Key "*/doc_del_count">
-#      Type "counter"
-#    </Key>
-#    <Key "*/disk_size">
-#      Type "bytes"
-#    </Key>
-#  </URL>
-#</Plugin>
-
 #<Plugin "curl_xml">
 #      <URL "http://localhost/stats.xml">
 #              Host "my_host"
@@ -305,22 +269,6 @@ LoadPlugin users
 #      </Directory>
 #</Plugin>
 
-#<Plugin gmond>
-#      MCReceiveFrom "239.2.11.71" "8649"
-#
-#      <Metric "swap_total">
-#              Type "swap"
-#              TypeInstance "total"
-#              DataSource "value"
-#      </Metric>
-#
-#      <Metric "swap_free">
-#              Type "swap"
-#              TypeInstance "free"
-#              DataSource "value"
-#      </Metric>
-#</Plugin>
-
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634
@@ -389,20 +337,6 @@ LoadPlugin users
 #      Port 411
 #</Plugin>
 
-#<Plugin memcachec>
-#      <Page "plugin_instance">
-#              Server "localhost"
-#              Key "page_key"
-#              <Match>
-#                      Regex "(\\d+) bytes sent"
-#                      ExcludeRegex "<lines to be excluded>"
-#                      DSType CounterAdd
-#                      Type "ipt_octets"
-#                      Instance "type_instance"
-#              </Match>
-#      </Page>
-#</Plugin>
-
 #<Plugin memcached>
 #      Socket "/var/run/memcached.sock"
 # or:
@@ -639,13 +573,6 @@ LoadPlugin users
 #      </Module>
 #</Plugin>
 
-#<Plugin rrdcached>
-#      DaemonAddress "unix:/var/run/rrdcached.sock"
-#      DataDir "/var/lib/rrdcached/db/collectd"
-#      CreateFiles true
-#      CollectStatistics true
-#</Plugin>
-
 <Plugin rrdtool>
        DataDir "/var/lib/collectd/rrd"
 #      CacheTimeout 120
@@ -777,11 +704,6 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
-#<Plugin tokyotyrant>
-#      Host "localhost"
-#      Port "1978"
-#</Plugin>
-
 #<Plugin unixsock>
 #      SocketFile "/var/run/collectd-unixsock"
 #      SocketGroup "collectd"

diff --git a/debian/control b/debian/control
index 1fb6d822be372965737321c0ec95fb7d5d6dc2aa..54bbabbf4ab4c9037839824fbb784bf6756dee49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,14 @@ 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, libltdl-dev, pkg-config,
+ bison, flex, autotools-dev, libltdl3-dev, pkg-config,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64],
- iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64],
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,
- libganglia1-dev (>= 3) [!kfreebsd-i386 !kfreebsd-amd64],
  libgcrypt11-dev,
  libglib2.0-dev,
  libhal-dev,
- libmemcached-dev,
  libmysqlclient-dev,
  libnotify-dev,
  libopenipmi-dev,
@@ -22,22 +19,17 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libperl-dev,
  libpq-dev,
  libprotobuf-c0-dev,
- librrd-dev (>= 1.4~),
- libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64],
-# 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~),
- libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64],
- libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ librrd-dev,
+ libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libsnmp-dev | libsnmp9-dev,
  libupsclient1-dev,
  libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64],
  libxml2-dev,
- libyajl-dev,
  linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64],
  openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
  python-dev
-Build-Conflicts: libpthread-dev
+Build-Conflicts: libpthread-dev, iptables-dev
 Standards-Version: 3.9.1
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
@@ -86,7 +78,6 @@ Description: statistics collection and monitoring daemon (core system)
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
-   * parse JSON files: curl_json
    * parse XML data: curl_xml
    * query data from a relational database: dbi
    * disk space usage: df
@@ -98,7 +89,6 @@ Description: statistics collection and monitoring daemon (core system)
    * 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
    * IPMI sensors information: ipmi
@@ -111,7 +101,6 @@ Description: statistics collection and monitoring daemon (core system)
    * 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
    * memory usage: memory
    * statistics from mon.itor.us: Monitorus (Perl based plugin)
@@ -136,7 +125,6 @@ Description: statistics collection and monitoring daemon (core system)
    * number of processes: processes
    * information about network protocols: protocols
    * embedded Python interpreter: python
-   * write data via the RRD accelerator daemon: rrdcached
    * output to RRD files: rrdtool
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
@@ -149,7 +137,6 @@ Description: statistics collection and monitoring daemon (core system)
    * TeamSpeak2 server statistics: teamspeak2
    * power consumption measurements from "The Energy Detective" (TED): ted
    * Linux ACPI thermal zone information: thermal
-   * Tokyo Tyrant server statistics: tokyotyrant
    * external runtime interface: unixsock
    * system uptime: uptime
    * number of users logged into the system: users

diff --git a/debian/rules b/debian/rules
index 068edecd573446b6efa86572e323a5ea74fe83d6..46fdbf8232ae58fd3f050652734e830f1e58eef8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,15 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libyajl is required for the curl_json plugin.
+confflags += --disable-curl_json
+
+# libganglia >= 3 is required for the gmond plugin.
+confflags += --disable-gmond
+
+# libmemcached is required for the memcachec plugin.
+confflags += --disable-memcachec
+
 # libmodbus is required for the modbus plugin.
 confflags += --disable-modbus
 
@@ -77,6 +86,12 @@ confflags += --disable-oracle
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
+# rrdclient support in librrd is required for the rrdcached plugin.
+confflags += --disable-rrdcached
+
+# libtokyotyrant is required for the tokyotyrant plugin.
+confflags += --disable-tokyotyrant
+
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms