From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 27 Sep 2014 20:02:10 +0000 (+0000)
Subject: Merged branch 'nmu5.4.1-3.1'.
X-Git-Tag: collectd-5.4.1-4~2
X-Git-Url: https://git.tokkee.org/?p=pkg-collectd.git;a=commitdiff_plain;h=710008215c6405b3e61df5f6f0f79e63463d30b1

Merged branch 'nmu5.4.1-3.1'.
---

710008215c6405b3e61df5f6f0f79e63463d30b1
diff --cc debian/changelog
index 5d18ccf,248fbb1..f3b925c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
 +collectd (5.4.1-4) UNRELEASED; urgency=medium
 +
 +  * debian/rules:
 +    - Disable preprocessor warnings on kfreebsd to work around an error
 +      resulting from a redefined macro in PostgreSQL's pg_config_manual.h;
 +      thanks to Ivo De Decker for reporting this (Closes: #760719).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sat, 27 Sep 2014 19:51:49 +0000
 +
+ collectd (5.4.1-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian/control:
+     - Build-Depend on libprotobuf-c-dev instead of libprotobuf-c0-dev due to
+       the protobuf-c transition (Closes: #756422).
+ 
+  -- Robert S. Edmonds <edmonds@debian.org>  Tue, 12 Aug 2014 15:36:27 -0400
+ 
  collectd (5.4.1-3) unstable; urgency=medium
  
    * debian/control: