Merge branch 'master' into jessie-backports

diff --cc debian/changelog
index 70b66cc7d406419fc0d320326283a2c17ecfaeb6,e1d060f5f9f375be04259d5f2c3082ef179b7ed8..c436161c94442f8b235756955eabc2b7d1cf4f34
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- collectd (5.5.0-2~bpo8+1) jessie-backports; urgency=medium
++collectd (5.5.0-3~bpo8+1~conova) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Set jessie-backports as gbp branch.
 +
-  -- Bernd Zeimetz <bzed@debian.org>  Tue, 25 Aug 2015 13:36:43 +0200
++ -- Bernd Zeimetz <bzed@debian.org>  Thu, 10 Sep 2015 14:55:09 +0200
++
+ collectd (5.5.0-3) UNRELEASED; urgency=medium
+ 
+   * debian/rules, debian/control:
+     - Avoid hiding compiler options at build time, allowing the buildd log
+       scanner to do it's job.
+     - Disable smart plugin on non-linux platforms, due to missing
+       libatasmart-dev build-dependency.
+     - Strip out non-deterministic bits out of generated jar files.
+   * debian/collectd-core.overrides:
+     - Update 'capitalization-error-in-description' lintian override.
+   * debian/rules, debian/collectd-core.collectd.service:
+     - Rename systemd service file to collectd-core.collectd.service, to honour
+       debhelper's naming convention.
+   * debian/collectd-core.collectd.service:
+     - Check for configuration file presence before starting the daemon.
+     - Check for configuration file validity before starting the daemon.
+   * debian/control, debian/changelog:
+     - Update my email address to match identity of current GPG key.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Tue, 25 Aug 2015 06:55:52 +0200
  
  collectd (5.5.0-2) unstable; urgency=low
  

diff --cc debian/gbp.conf
index 13cb42f68f5de127fb5fa3195934ae95f192c86c,dc23ff8dbfc8b6914a5e073f2c2da441e44a302c..6c67fd8f26b762a501db66797b24530ca9e00917
--- 1/debian/gbp.conf
--- 2/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,4 +1,5 @@@
  # Configuration file for git-buildpackage and friends
  [DEFAULT]
  pristine-tar = True
 +debian-branch = jessie-backports
+ debian-tag = collectd-%(version)s