Merged branch 'unstable-nmu'.

Conflicts:
	debian/changelog
	debian/patches/00list

diff --cc debian/changelog
index e28d806e8e7ac07ad3048f8550d47004cf065393,052b65a54468c2b179a1351bb1d4c85560e00684..3d26132c6727bd6d770fa42da7df3f09d6bdbbfa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,92 -1,18 +1,107 @@@
 +collectd (5.3.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream release:
 +    - MySQL plugin now uses the name of the <Database> block rather than the
 +      database name to identify the read callback; thanks to Mathieu Parent
 +      for reporting this (Closes: #703446).
 +    New plugins:
 +    - incremental parsing of CSV files: tail_csv
 +    - send collected values to Riemann: write_riemann
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 02 May 2013 21:22:46 +0200
 +
 +collectd (5.2.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * debian/patches:
 +    - Removed postgresql_writer_memleak.dpatch -- applied upstream.
 +  * debian/collectd-utils.install:
 +    - Install collectd-tg manpage.
 +  * debian/control:
 +    - Updated standards-version to 3.9.4 -- no changes.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Wed, 30 Jan 2013 21:35:30 +0100
 +
 +collectd (5.2.0-2) experimental; urgency=low
 +
 +  * debian/patches:
 +    - Added postgresql_writer_memleak.dpatch fixing a memory leak in the
 +      PostgreSQL writer implementation.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 29 Nov 2012 09:09:51 +0100
 +
 +collectd (5.2.0-1) experimental; urgency=low
 +
 +  * New upstream release:
 +    - ping plugin: Don't abort if ping_send fails but report an error only;
 +      thanks to Bernd Zeimetz for reporting this (Closes: #630683).
 +    - df plugin: Ignore "rootfs" file-system type to make sure that root
 +      file-system statistics are only collected once; thanks to Florian La
 +      Roche for reporting this (Closes: #657122).
 +    - Fixed parse errors when using (including) empty config files; thanks to
 +      Reinhard Tartler for reporting this (Closes: #592881).
 +    New plugins:
 +    - Aggregate multiple values lists into one: aggregation
 +    - Query statistics from BSD's packet filter: pf (FreeBSD only)
 +  * Uploading to experimental because of the Wheezy freeze.
 +  * debian/control, debian/rules:
 +    - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable
 +      the 'pf' plugin on non-kfreebsd systems.
 +  * debian/patches:
 +    - Removed migrate-4-5-df.dpatch; merged upstream.
 +    - Removed rtnl_dump_filter.dpatch; merged upstream.
 +    - Added myplugin_includes.dpatch -- change the example plugin include path
 +      to /usr/include/collectd/core/ (see below).
 +    - rrd_filter_path.dpatch: Also patch the migrate-4-5 script; while this is
 +      not required for the (optional) auto-migration when updating the package
 +      (the full path is passed as an argument) it helps the user to just use
 +      the script without the need to add further arguments; thanks to Joey
 +      Hess for reporting this (Closes: #689001).
 +  * debian/rules:
 +    - Fix installation paths used for Perl bindings. Upstream now passes
 +      INSTALL_BASE rather than PREFIX to Makefile.PL which resulted in the
 +      bindings being installed to different locations than before.
 +  * debian/collectd-utils.install:
 +    - Install collectd-tg(1).
 +  * debian/libcollectdclient-dev.install:
 +    - Install the libcollectdclient network*.h header files.
 +  * Renamed libcollectclient0 to libcollectdclient1 due to the SONAME version
 +    bump.
 +  * debian/libcollectdclient1.symbols:
 +    - Updated for 5.2.
 +  * debian/collectd-dev.install:
 +    - Install the collectd (daemon) headers to /usr/include/collectd/core/
 +      rather than /usr/include/collectd/. The latter is used by
 +      libcollectdclient which causes file conflicts.
 +  * debian/collectd.conf:
 +    - Let the 'df' plugin ignore 'rootfs' (else, the root file-system would
 +      appear twice, causing one of the updates to fail and spam the log) and
 +      the usual virtual / temporary file-systems (cf. #657122).
 +  * debian/collectd-core.postrm:
 +    - Source the debconf confmodule to make the db_* functions available;
 +      thanks to Joey Hess and YunQiang Su for reporting this
 +      (Closes: #680172, #688285).
 +  * debian/po:
 +    - Updated Brazilian Portuguese debconf templates; thanks to Adriano Rafael
 +      Gomes (Closes: #685760).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 15:40:12 +0100
 +
+ collectd (5.1.0-3.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Fix "FTBFS with perl 5.18: POD errors":
+     add patch pod-perl-5.18 that adds =encoding to some POD files.
+     (Closes: #708718)
+   * Fix "Transition package to use default java implementation":
+     apply modified patch from Ubuntu / James Page:
+     - switch build dependency from openjdk-6-jdk to default-jdk
+     - set JAVA_HOME to /usr/lib/jvm/default-java
+     - update lintian override accordingly
+     (Closes: #683525)
+ 
+  -- gregor herrmann <gregoa@debian.org>  Sun, 26 May 2013 00:52:37 +0200
+ 
  collectd (5.1.0-3) unstable; urgency=low
  
    * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:

diff --cc debian/control
Simple merge

diff --cc debian/patches/00list
index 23aacf62e043c084fffcce668440b01881337668,f9ab0716b005269bb5643fa07fb5947b9260b747..5a851be66aad4567499813be8a955a92f1ec9c14
--- 1/debian/patches/00list
--- 2/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,4 -1,6 +1,5 @@@
  rrd_filter_path.dpatch
  collection_conf_path.dpatch
 +myplugin_includes.dpatch
  bts559801_plugin_find_fix.dpatch
 -rtnl_dump_filter.dpatch
 -migrate-4-5-df.dpatch
+ pod-perl-5.18.dpatch

diff --cc debian/rules
Simple merge