Merge branch 'master' into wheezy-backports-sloppy

diff --git a/debian/changelog b/debian/changelog
index 04b3d64aed639bfec5f6ed1ac8e3a34d6c8cc4fb..489a64c176fb923b4bd7ce7c0a4546f460f36bc2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+collectd (5.5.1-1) unstable; urgency=medium
+
+  * New upstream release:
+    - The "LC_NUMERIC" locale is now forced to "C", preventing problems on
+      environments where the locale uses a comma as decimal separator. Thanks
+      to Hubert Jarosz for reporting this (Closes: #799289).
+    - Fixed FTBFS with GCC 6.0; thanks to Martin Michlmayr for reporting this
+      (Closes: #811580).
+  * debian/patches:
+    - Removed bts802249_varnish_41.patch; implemented upstream.
+  * debian/collectd.conf:
+    - Sync with upstream changes since 5.5.0.
+
+ -- Marc Fournier <marc@bl.uem.li>  Fri, 22 Jan 2016 16:53:49 +0100
+
+collectd (5.5.0-4) unstable; urgency=medium
+
+  * debian/collectd-core.overrides:
+    - Update 'binary-or-shlib-defines-rpath' lintian override.
+  * debian/rules:
+    - Strip out non-deterministic bits out of generated jar files.
+    - Remove RTLD_GLOBAL workaround, which was fixed upstream.
+  * debian/patches:
+    - Add bts802249_varnish_41.patch (Closes: #802249)
+
+ -- Marc Fournier <marc@bl.uem.li>  Mon, 16 Nov 2015 21:03:31 +0100
+
 collectd (5.5.0-3~bpo7+1) wheezy-backports-sloppy; urgency=medium
 
   * Rebuild for wheezy-backports-sloppy.

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index 6caf9536700ef2077f2e8b318485dcda647a8220..ac35a353623fe494fc54389d0e3adce42155a546 100644 (file)
--- a/debian/collectd-core.overrides
+++ b/debian/collectd-core.overrides
@@ -11,5 +11,5 @@ collectd-core: capitalization-error-in-description python Python
 # The "java" plugin uses libjvm.so which can only be found in a non-standard
 # directory. According to the Java guys the path name and the ABI is stable
 # though ...
-collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/*/jre/lib/*/server
+collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/*/jre/lib/*/*
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 770a03425e9c08228199f33ba16f7a42196a75cf..cea1e59202e0b9f0f4f2f0a5555be835596addf3 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -284,7 +284,7 @@ LoadPlugin users
 
 #<Plugin battery>
 #      ValuesPercentage false
-#      ReportDegraded
+#      ReportDegraded false
 #</Plugin>
 
 #<Plugin bind>
@@ -464,7 +464,6 @@ LoadPlugin users
        IgnoreSelected true
 
 #      ReportByDevice false
-#      ReportReserved false
 #      ReportInodes false
 
 #      ValuesAbsolute true
@@ -558,6 +557,7 @@ LoadPlugin users
 
 #<Plugin iptables>
 #      Chain "table" "chain"
+#      Chain6 "table" "chain"
 #</Plugin>
 
 #<Plugin irq>

diff --git a/debian/rules b/debian/rules
index ed39454d3d096f67f9443c14c71eb65a0041962a..17983fd7eff59ea3df7ca353865ce7bd09306fdf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,6 @@ CPPFLAGS += -I$(CURDIR)/debian/include
 CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS += -Wall -Wno-error=deprecated-declarations
 
-# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
-# however required by the perl plugin (which would otherwise be unable to find
-# symbols defined in libperl when loading perl modules that require such
-# symbols). This is a workaround for this issue.
-CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
-
 # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to
 # /etc/collectd would be wrong though.
 CPPFLAGS += -UCONFIGFILE