Merged commit 'collectd-4.6.3-1' into etch-backports.

diff --cc debian/changelog
index e87e290e7484e566eaf4a26b2e36297f9075c68a,bcbe7eedc2119b575cc762a34348011029fa044c..96d0d546f9f98d9225496c8cd45a4bec6e7464d7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,54 +1,75 @@@
+ collectd (4.6.3-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * debian/patches:
+     - Removed battery_acpi_complain.dpatch - included upstream.
+     - Removed include_empty_files.dpatch - included upstream.
+     - Removed ntpd_type_pun_fix.dpatch - included upstream.
+     - Removed rrdtool_uninitialized_fix.dpatch - included upstream.
+     - Added libcollectdclient_static_sstrerror.dpatch to make a private
+       function in libcollectdclient static.
+   * debian/rules:
+     - Install collectd-network.py to /usr/share/doc/collectd/examples/.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Tue, 02 Jun 2009 22:03:10 +0200
+ 
+ collectd (4.6.2-3) unstable; urgency=low
+ 
+   * debian/patches:
+     - Actually enabled rrdtool_uninitialized_fix.dpatch - d'oh!
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Fri, 29 May 2009 15:49:46 +0200
+ 
+ collectd (4.6.2-2) unstable; urgency=low
+ 
+   * debian/patches:
+     - Added battery_acpi_complain.dpatch - upstream patch to fix excessive
+       error messages in the battery plugin in case /proc/acpi/battery is not
+       available.
+     - Added ntpd_type_pun_fix.dpatch - upstream patch to fix dereferencing of
+       a type-punned pointer identified by GCC 4.4, thanks to Martin Michlmayr
+       for reporting this (Closes: #526667).
+     - Added include_empty_files.dpatch - upstream patch to fix the inclusion
+       of empty configuration files, thanks to Alexander Wirt for reporting
+       this.
+     - Added rrdtool_uninitialized_fix.dpatch - upstream patch to fix an
+       uninitialized value warning in the rrdtool plugin, thanks to Andreas
+       Moog for reporting this.
+   * debian/collectd.conf, debian/filters.conf:
+     - Added a sample filter chain configuration.
+   * debian/rules:
+     - Added contrib/php-collection/ to /usr/share/doc/collectd/.
+     - Disabled "netlink" plugin on mips and mipsel - those architectures do
+       not allow to link non-PIC code into shared objects, thanks to Peter De
+       Schrijver for reporting this (Closes: #524593).
+   * debian/control:
+     - Build-depend on iptables-dev (>= 1.4.3.2-2) to link against the packaged
+       libiptc which is available as shared library since iptables 1.4.3.
+       Depend on versions >= 1.4.3.2-2 because of #524766.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Fri, 29 May 2009 14:12:36 +0200
+ 
 +collectd (4.6.2-1~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).
 +  * Disabled the "openipmi" plugin - the work around for #474087 (broken
 +    openipmi .pc files) no longer works because of the strict dependency
 +    checking introduced in 4.5.1. Removed libopenipmi-dev build-dependency.
 +  * Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
 +    libdbi is not available on Etch.
 +
 + -- Sebastian Harl <sh@tokkee.org>  Mon, 13 Apr 2009 22:51:56 +0200
 +
  collectd (4.6.2-1) unstable; urgency=low
  
    * New upstream release.

diff --cc debian/control
index c03094b62e82e1b91eea69caf041b0d429e7b2e1,bfc9d37bbe7aa25aafc8483d1a916640a6a92fff..d9839ba20016e2022c30b0e74b2f9f9f71b0cbd1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,9 -1,9 +1,9 @@@
  Source: collectd
  Section: utils
  Priority: optional
- Maintainer: Sebastian Harl <sh@tokkee.org>
- Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
+ 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
 -Build-Conflicts: libpthread-dev
++Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
 +Build-Conflicts: libpthread-dev, iptables-dev
  Standards-Version: 3.8.1
  Homepage: http://collectd.org/
  Vcs-Git: git://git.tokkee.org/pkg-collectd.git

diff --cc debian/rules
index e58bc2ceae94e3fa012d2592aa84473e6380da17,c944ebe6ff8d6b653bda2d500100699841d57251..8f251118b8bd49801b1842f19dc27072f31cffae
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -46,11 -46,10 +46,11 @@@ confflags = --host=$(DEB_HOST_GNU_TYPE
  # These plugins do not provide any functionality under Linux.
  confflags += --disable-apple_sensors --disable-tape
  
 -# The static library netstat cannot be linked into shared objects on some
 -# architectures (see bugs #358637 and #419684 for more details).
 +# The static libraries netstat and upsclient cannot be linked into shared
 +# objects on some architectures (see bugs #358637 and #419684 for more
 +# details).
- ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
+ ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
 -      confflags += --disable-netlink
 +      confflags += --disable-netlink --disable-nut
  endif
  
  # libvirt is only available on amd64, i386 and powerpc.