From eb2ef6642ad3bec813027862c303770b3397509e Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Mon, 23 Sep 2019 23:40:09 +1000 Subject: [PATCH 1/8] Update to 5.9.1 --- debian/changelog | 11 +++++ debian/patches/i2c_detection.patch | 45 ------------------- .../liblvm2app_depreciation_warning.patch | 18 -------- debian/patches/series | 2 - debian/rules | 2 - 5 files changed, 11 insertions(+), 67 deletions(-) delete mode 100644 debian/patches/i2c_detection.patch delete mode 100644 debian/patches/liblvm2app_depreciation_warning.patch diff --git a/debian/changelog b/debian/changelog index 549937e..8535060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +collectd (5.9.1-1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "GCC 8.3/4 Tool Chain Issue": + debian/rules: removes build with -Wno-error=format-truncation as a temporary + workaround for the build failure with gcc-8 caused by a compiler warning. + * debian/patches: + - Remove liblvm2app_depreciation_warning.patch i2c_detection.patch ; upstream + + -- zebity spring Sun, 22 Sep 2019 21:55:00 +1000 + collectd (5.8.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/i2c_detection.patch b/debian/patches/i2c_detection.patch deleted file mode 100644 index 9b21f87..0000000 --- a/debian/patches/i2c_detection.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: configure: barometer: fix i2c lib usage for 4.0 -Forwarded: https://github.com/collectd/collectd/issues/2646 -Author: Andreas Hasenack -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1742691 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886920 -Last-Update: 2018-02-21 - -diff --git a/Makefile.am b/Makefile.am -index ae027a368..ef71be836 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -591,7 +591,7 @@ if BUILD_PLUGIN_BAROMETER - pkglib_LTLIBRARIES += barometer.la - barometer_la_SOURCES = src/barometer.c - barometer_la_LDFLAGS = $(PLUGIN_LDFLAGS) --barometer_la_LIBADD = -lm -+barometer_la_LIBADD = -lm -li2c - endif - - if BUILD_PLUGIN_BATTERY -diff --git a/configure.ac b/configure.ac -index e869a6a09..d9854d024 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1883,7 +1883,7 @@ if test "x$ac_system" = "xLinux"; then - [with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"], - [[ - #include -- #include -+ #include - ]] - ) - else -diff --git a/src/barometer.c b/src/barometer.c -index f698005ca..e3d418d2a 100644 ---- a/src/barometer.c -+++ b/src/barometer.c -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/debian/patches/liblvm2app_depreciation_warning.patch b/debian/patches/liblvm2app_depreciation_warning.patch deleted file mode 100644 index 170ef29..0000000 --- a/debian/patches/liblvm2app_depreciation_warning.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: mute liblvm2app depreciation warning -Forwarded: https://github.com/collectd/collectd/issues/2647 -Author: Christian Ehrhardt -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881641 - -Index: collectd-5.8.1/Makefile.am -=================================================================== ---- collectd-5.8.1.orig/Makefile.am -+++ collectd-5.8.1/Makefile.am -@@ -1056,7 +1056,7 @@ endif - if BUILD_PLUGIN_LVM - pkglib_LTLIBRARIES += lvm.la - lvm_la_SOURCES = src/lvm.c --lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS) -+lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS) -Wno-cpp - lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLVM2APP_LDFLAGS) - lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS) - endif diff --git a/debian/patches/series b/debian/patches/series index c30f88f..8c3f46b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,3 @@ rrd_filter_path.patch collection_conf_path.patch myplugin_includes.patch nagios-debian-paths.patch -i2c_detection.patch -liblvm2app_depreciation_warning.patch diff --git a/debian/rules b/debian/rules index 6426540..2703f09 100755 --- a/debian/rules +++ b/debian/rules @@ -16,8 +16,6 @@ CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) CPPFLAGS += -I$(CURDIR)/debian/include CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -Wno-error=deprecated-declarations -# 897724 -CFLAGS += -Wno-error=format-truncation # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to # /etc/collectd would be wrong though. From 94970b36ee14b50224a2ca06efafb05d16486c57 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Tue, 24 Sep 2019 00:36:23 +1000 Subject: [PATCH 2/8] Remove for failure from configure result --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2703f09..7959088 100755 --- a/debian/rules +++ b/debian/rules @@ -205,7 +205,7 @@ build-stamp: ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \ JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \ - || ( status=$$?; cat config.log; exit $$status ) + || ( echo "configure exit status: $$?" ; cat config.log ) $(MAKE) dh_auto_test From 137fd48915a7e6f3a6b7f560d46d8e6163836e2c Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Tue, 24 Sep 2019 10:05:28 +1000 Subject: [PATCH 3/8] Update to 5.9.2, due to defects in 5.9.1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8535060..a9c5e3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -collectd (5.9.1-1) unstable; urgency=medium +collectd (5.9.2-1) unstable; urgency=medium * Non-maintainer upload. * Fix "GCC 8.3/4 Tool Chain Issue": From d2dc1424a6df6201fc1404508c78005fcd3cdeb9 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Tue, 24 Sep 2019 19:20:02 +1000 Subject: [PATCH 4/8] Add varnish re-enable into changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9c5e3a..f62c9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ collectd (5.9.2-1) unstable; urgency=medium workaround for the build failure with gcc-8 caused by a compiler warning. * debian/patches: - Remove liblvm2app_depreciation_warning.patch i2c_detection.patch ; upstream + * debian/control + - Add re-enable varnish plugin ; upstream -- zebity spring Sun, 22 Sep 2019 21:55:00 +1000 From d6fa9cf0cebab2329dfb4f9be626a1f837b37f32 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Tue, 24 Sep 2019 19:28:33 +1000 Subject: [PATCH 5/8] Add varnish re-enable into changelog --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6c13ef8..701ac4a 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh libtokyotyrant-dev [linux-any], libudev-dev [linux-any], libupsclient-dev | libupsclient1-dev, -# libvarnishapi-dev, + libvarnishapi-dev, libvirt-dev (>= 0.4.0-6) [linux-any], libxen-dev [amd64 arm64 armhf i386], libxml2-dev, From 81df471eccfa4bc7f3e4840dc1b7888dbcb10464 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Sun, 10 Nov 2019 14:29:15 +1100 Subject: [PATCH 6/8] Turn off GCC 9 warnings that break snnp & dpdp build --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index 7959088..d5db18b 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,11 @@ CPPFLAGS += -I$(CURDIR)/debian/include CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -Wno-error=deprecated-declarations +TEST_GCC_VER_9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9) +ifeq ($(TEST_GCC_VER_9),1) + CFLAGS += -Wno-error=address-of-packed-member -Wno-stringop-truncation +endif + # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to # /etc/collectd would be wrong though. CPPFLAGS += -UCONFIGFILE From 55bcb281fbba27c39d4c321a8d97351726f5f71a Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Sun, 17 Nov 2019 14:02:09 +1100 Subject: [PATCH 7/8] Align with debian https://salsa.debian.org/debian/pkg-collectd updates --- debian/{NEWS.Debian => NEWS} | 0 debian/changelog | 10 +++++++--- debian/collectd-core.templates | 8 ++++---- debian/control | 13 ++++++++----- debian/po/cs.po | 6 +++--- debian/po/da.po | 8 ++++---- debian/po/de.po | 8 ++++---- debian/po/es.po | 8 ++++---- debian/po/fr.po | 8 ++++---- debian/po/gl.po | 8 ++++---- debian/po/it.po | 8 ++++---- debian/po/ja.po | 8 ++++---- debian/po/nl.po | 8 ++++---- debian/po/pl.po | 8 ++++---- debian/po/pt.po | 8 ++++---- debian/po/pt_BR.po | 8 ++++---- debian/po/ru.po | 8 ++++---- debian/po/sk.po | 8 ++++---- debian/po/sv.po | 8 ++++---- debian/po/templates.pot | 10 +++++----- debian/po/vi.po | 6 +++--- debian/rules | 22 +++++++++++++++++----- 22 files changed, 103 insertions(+), 84 deletions(-) rename debian/{NEWS.Debian => NEWS} (100%) diff --git a/debian/NEWS.Debian b/debian/NEWS similarity index 100% rename from debian/NEWS.Debian rename to debian/NEWS diff --git a/debian/changelog b/debian/changelog index f62c9d1..dd2b5e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ collectd (5.9.2-1) unstable; urgency=medium * Non-maintainer upload. - * Fix "GCC 8.3/4 Tool Chain Issue": - debian/rules: removes build with -Wno-error=format-truncation as a temporary - workaround for the build failure with gcc-8 caused by a compiler warning. + * debian/rules: + - Fix "GCC 8.3/4 Tool Chain Issue": removes build with -Wno-error=format-truncation as a temporary + workaround for the build failure with gcc-8 caused by a compiler warning. + - Fix "GCC 9.X Tool Chain Issues": add test for GCC 9 and build with -Wno-error=address-of-packed-member -Wno-stringop-truncation + - Align with Debian Updates: @bzed https://salsa.debian.org/debian/pkg-collectd * debian/patches: - Remove liblvm2app_depreciation_warning.patch i2c_detection.patch ; upstream * debian/control - Add re-enable varnish plugin ; upstream + - Update to phython3 (consistent with Debian updates @bzed https://salsa.debian.org/debian/pkg-collectd + - Add libqpid-proton11-dev, libmosquitto-dev (modules) (consistent with Debian updates) -- zebity spring Sun, 22 Sep 2019 21:55:00 +1000 diff --git a/debian/collectd-core.templates b/debian/collectd-core.templates index 9ff7311..7cc43b5 100644 --- a/debian/collectd-core.templates +++ b/debian/collectd-core.templates @@ -8,7 +8,7 @@ _Description: Layout of RRD files has changed This step requires both the perl and the rrdtool packages to be installed, which is currently not the case. You need to perform the migration manually. . - See /usr/share/doc/collectd-core/NEWS.Debian.gz for details. + See /usr/share/doc/collectd-core/NEWS.gz for details. Template: collectd/auto-migrate-3-4 Type: boolean @@ -22,7 +22,7 @@ _Description: Automatically try to migrate your RRD files? /var/lib/collectd/ is made in /var/backups/. This script is still experimental, though. Do not expect it to work in all cases. . - See /usr/share/doc/collectd-core/NEWS.Debian.gz for details. + See /usr/share/doc/collectd-core/NEWS.gz for details. Template: collectd/migration-4-5 Type: note @@ -34,7 +34,7 @@ _Description: Layout of RRD files has changed in version 5.0 This step requires both the perl and the rrdtool packages to be installed, which is currently not the case. You need to perform the migration manually. . - See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at + See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at for details. Template: collectd/auto-migrate-4-5 @@ -49,7 +49,7 @@ _Description: Automatically try to migrate your RRD files? /var/lib/collectd/ is made in /var/backups/. This script is still experimental, though. Do not expect it to work in all cases. . - See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at + See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at for details. Template: collectd/postrm_purge_data diff --git a/debian/control b/debian/control index 701ac4a..930dd22 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Uploaders: Marc Fournier +Uploaders: Marc Fournier , Bernd Zeimetz Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh-strip-nondeterminism, dh-autoreconf, bison, flex, autotools-dev, libltdl-dev, pkg-config, default-libmysqlclient-dev, @@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh libkvm-dev [kfreebsd-any], libldap2-dev, liblua5.3-dev, - liblvm2-dev [linux-any], +# liblvm2-dev [linux-any], libmemcached-dev, libmicrohttpd-dev, libmodbus-dev, @@ -65,9 +65,11 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh protobuf-c-compiler, protobuf-compiler (>= 3.0.0), protobuf-compiler-grpc [amd64 arm64 armel armhf i386 ppc64el powerpc], - python-dev, - riemann-c-client -Build-Conflicts: libpthread-dev, libhal-dev + python3-dev, + riemann-c-client, + libqpid-proton11-dev, + libmosquitto-dev +Build-Conflicts: libpthread-dev, libhal-dev, python-dev Standards-Version: 4.2.1 Homepage: https://collectd.org/ Vcs-Git: https://github.com/collectd/pkg-debian.git @@ -107,6 +109,7 @@ Description: statistics collection and monitoring daemon (core system) package. . * AMQP output plugin: amqp + * AMQP 1.0 output plugin: amqp1 * Apache and lighttpd statistics provided by mod_status: apache * APC UPS's charge, load, input/output/battery voltage, etc.: apcups * Ascent server statistics: ascent diff --git a/debian/po/cs.po b/debian/po/cs.po index 37abe02..7f4c9ce 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -52,9 +52,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Pro více informací se podívejte na /usr/share/doc/collectd-core/NEWS.Debian.gz." +"Pro více informací se podívejte na /usr/share/doc/collectd-core/NEWS.gz." #. Type: boolean #. Description @@ -104,7 +104,7 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" "Pro více informací se podívejte do souboru /usr/share/doc/collectd-core/NEWS." diff --git a/debian/po/da.po b/debian/po/da.po index b6cea86..346ce81 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -53,8 +53,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Se /usr/share/doc/collectd-core/NEWS.Debian.gz for detaljer." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Se /usr/share/doc/collectd-core/NEWS.gz for detaljer." #. Type: boolean #. Description @@ -104,10 +104,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Se /usr/share/doc/collectd-core/NEWS.Debian.gz og wikien for collectd på " +"Se /usr/share/doc/collectd-core/NEWS.gz og wikien for collectd på " " for detaljer." #. Type: boolean diff --git a/debian/po/de.po b/debian/po/de.po index 16d03b7..f4c8bc1 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -55,8 +55,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Siehe »/usr/share/doc/collectd-core/NEWS.Debian.gz« für Details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Siehe »/usr/share/doc/collectd-core/NEWS.gz« für Details." #. Type: boolean #. Description @@ -108,10 +108,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Siehe »/usr/share/doc/collectd-core/NEWS.Debian.gz« und das collectd Wiki " +"Siehe »/usr/share/doc/collectd-core/NEWS.gz« und das collectd Wiki " "unter " "für Details." diff --git a/debian/po/es.po b/debian/po/es.po index 479cc0c..388062e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -82,9 +82,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian.gz» para más detalles." +"Vea el archivo «/usr/share/doc/collectd-core/NEWS.gz» para más detalles." #. Type: boolean #. Description @@ -135,10 +135,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Para más detalles consulte «/usr/share/doc/collectd-core/NEWS.Debian.gz» y la " +"Para más detalles consulte «/usr/share/doc/collectd-core/NEWS.gz» y la " "página wiki de collectd en " "." diff --git a/debian/po/fr.po b/debian/po/fr.po index d59a599..194355c 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -57,9 +57,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Veuillez lire le fichier « /usr/share/doc/collectd-core/NEWS.Debian.gz » pour " +"Veuillez lire le fichier « /usr/share/doc/collectd-core/NEWS.gz » pour " "plus d'informations." #. Type: boolean @@ -113,10 +113,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Voir /usr/share/doc/collectd-core/NEWS.Debian.gz et le wiki de collectd " +"Voir /usr/share/doc/collectd-core/NEWS.gz et le wiki de collectd " "() pour plus de " "détails." diff --git a/debian/po/gl.po b/debian/po/gl.po index 78d4ecc..71cbaf7 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -56,8 +56,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Consulte /usr/share/doc/collectd-core/NEWS.Debian.gz para máis detalles." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Consulte /usr/share/doc/collectd-core/NEWS.gz para máis detalles." #. Type: boolean #. Description @@ -107,10 +107,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Consulte o ficheiro /usr/share/doc/collectd-core/NEWS.Debian.gz e a wiki de " +"Consulte o ficheiro /usr/share/doc/collectd-core/NEWS.gz e a wiki de " "collectd en " "para obter máis detalles." diff --git a/debian/po/it.po b/debian/po/it.po index 2b4e41c..da3a1bd 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -56,8 +56,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian.gz." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.gz." #. Type: boolean #. Description @@ -108,10 +108,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian.gz e il wiki di " +"Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.gz e il wiki di " "collectd all'indirizzo " "." diff --git a/debian/po/ja.po b/debian/po/ja.po index 9d34154..85c2113 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -52,9 +52,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz を参照してください。" +"詳細については /usr/share/doc/collectd-core/NEWS.gz を参照してください。" #. Type: boolean #. Description @@ -104,10 +104,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz 及び collectd wiki " +"詳細については /usr/share/doc/collectd-core/NEWS.gz 及び collectd wiki " " を見てください。" #. Type: boolean diff --git a/debian/po/nl.po b/debian/po/nl.po index 4b67f9b..67f3cf5 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -56,8 +56,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Zie /usr/share/doc/collectd-core/NEWS.Debian.gz voor meer informatie." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Zie /usr/share/doc/collectd-core/NEWS.gz voor meer informatie." #. Type: boolean #. Description @@ -108,10 +108,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Zie /usr/share/doc/collectd-core/NEWS.Debian.gz en de wikipagina van " +"Zie /usr/share/doc/collectd-core/NEWS.gz en de wikipagina van " "collectd, , " "voor meer informatie." diff --git a/debian/po/pl.po b/debian/po/pl.po index c43369c..9bceb8d 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -56,9 +56,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Plik /usr/share/doc/collectd-core/NEWS.Debian.gz zawiera więcej szczegółów." +"Plik /usr/share/doc/collectd-core/NEWS.gz zawiera więcej szczegółów." #. Type: boolean #. Description @@ -109,10 +109,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Plik /usr/share/doc/collectd-core/NEWS.Debian.gz oraz wiki collectd zawiera więcej " "informacji na ten temat." diff --git a/debian/po/pt.po b/debian/po/pt.po index c2fbcc3..fa6d754 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -56,8 +56,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian.gz para mais detalhes." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Veja /usr/share/doc/collectd-core/NEWS.gz para mais detalhes." #. Type: boolean #. Description @@ -107,10 +107,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em " +"Veja /usr/share/doc/collectd-core/NEWS.gz e o wiki do collectd em " " para mais " "detalhes." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 2313b01..4a3aafd 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -55,8 +55,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian.gz para detalhes." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Veja /usr/share/doc/collectd-core/NEWS.gz para detalhes." #. Type: boolean #. Description @@ -106,10 +106,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em " +"Veja /usr/share/doc/collectd-core/NEWS.gz e o wiki do collectd em " " para detalhes." #. Type: boolean diff --git a/debian/po/ru.po b/debian/po/ru.po index 4fa8fc9..216a604 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -55,8 +55,8 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Подробности см. в /usr/share/doc/collectd-core/NEWS.Debian.gz." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Подробности см. в /usr/share/doc/collectd-core/NEWS.gz." #. Type: boolean #. Description @@ -106,11 +106,11 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" "Дополнительную информацию можно найти в файле /usr/share/doc/collectd-core/" -"NEWS.Debian.gz и вики collectd wiki по адресу ." #. Type: boolean diff --git a/debian/po/sk.po b/debian/po/sk.po index c5138c3..0548be3 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -47,8 +47,8 @@ msgstr "Tento krok vyžaduje, aby boli nainštalované balíky perl a rrdtool. M #. Description #: ../collectd-core.templates:1001 #: ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." -msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz" +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." +msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.gz" #. Type: boolean #. Description @@ -89,8 +89,8 @@ msgstr "Rozloženie súborov RRD, ktoré vytvára collectd sa výrazne zmenilo o #. Description #: ../collectd-core.templates:3001 #: ../collectd-core.templates:4001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at for details." -msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz a na wiki collectd na adrese " +msgid "See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at for details." +msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.gz a na wiki collectd na adrese " #. Type: boolean #. Description diff --git a/debian/po/sv.po b/debian/po/sv.po index 7145316..7440574 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -56,9 +56,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Läs även /usr/share/doc/collectd-core/NEWS.Debian.gz för ytterligare " +"Läs även /usr/share/doc/collectd-core/NEWS.gz för ytterligare " "information." #. Type: boolean @@ -109,10 +109,10 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" -"För mer information läs /usr/share/doc/collectd-core/NEWS.Debian.gz och " +"För mer information läs /usr/share/doc/collectd-core/NEWS.gz och " "collectd-wikin på ." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 82d0bec..4c2c171 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the collectd package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2012-05-19 17:59+0200\n" +"POT-Creation-Date: 2019-11-16 22:06+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,7 +49,7 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" #. Type: boolean @@ -94,8 +94,8 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " -" for details." +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at for details." msgstr "" #. Type: boolean diff --git a/debian/po/vi.po b/debian/po/vi.po index ee4cf34..8915518 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -54,9 +54,9 @@ msgstr "" #. Type: boolean #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 -msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz for details." +msgid "See /usr/share/doc/collectd-core/NEWS.gz for details." msgstr "" -"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian.gz » để tìm chi " +"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.gz » để tìm chi " "tiết." #. Type: boolean @@ -114,7 +114,7 @@ msgstr "" #. Description #: ../collectd-core.templates:3001 ../collectd-core.templates:4001 msgid "" -"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at " +"See /usr/share/doc/collectd-core/NEWS.gz and the collectd wiki at " " for details." msgstr "" diff --git a/debian/rules b/debian/rules index d5db18b..ebb4a2b 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,8 @@ CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) CPPFLAGS += -I$(CURDIR)/debian/include CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -Wno-error=deprecated-declarations +CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) +CXXFLAGS += -Wall -Wno-error=deprecated-declarations TEST_GCC_VER_9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9) ifeq ($(TEST_GCC_VER_9),1) @@ -91,13 +93,18 @@ confflags += --disable-xmms # Cf. https://github.com/collectd/collectd/issues/1574 confflags += --disable-sigrok +# libnvidia-ml is non-free +confflags += --disable-gpu_nvidia + # temporarily disable varnish plugin, as #879471 blocks collectd from # migrating to testing. -confflags += --disable-varnish +# re-enable varnish +#confflags += --disable-varnish # temporarily disable mqtt plugin, as #911265, #911266 blocks collectd from # migrating to testing. -confflags += --disable-mqtt +# enable mqtt +#confflags += --disable-mqtt # These plugins are Linux-specific. ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) @@ -112,7 +119,6 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) --disable-ipc \ --disable-iptables \ --disable-ipvs \ - --disable-lvm \ --disable-madwifi \ --disable-md \ --disable-netlink \ @@ -175,6 +181,12 @@ ifeq (,$(filter amd64 i386, $(DEB_HOST_ARCH))) --disable-turbostat endif +# the pcie_errors plugin does not work on all kinds of hardware +ifeq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el, $(DEB_HOST_ARCH))) + confflags += \ + --disable-pcie_errors +endif + # This plugin is x86 and arm specific. ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_HOST_ARCH))) confflags += \ @@ -210,7 +222,7 @@ build-stamp: ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \ JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \ - || ( echo "configure exit status: $$?" ; cat config.log ) + || ( status=$$?; cat config.log; exit $$status ) $(MAKE) dh_auto_test @@ -291,7 +303,7 @@ binary-arch: build install-arch dh_testroot dh_installchangelogs -a ChangeLog dh_installdocs -A -a debian/README.Debian AUTHORS README - dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins + dh_installdocs -a debian/NEWS debian/README.Debian.plugins dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \ contrib/collection3/ contrib/php-collection/ \ contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \ From 37b3edadc399a6d05bf5c55ceb8d6701b4656fe0 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Sun, 17 Nov 2019 14:11:12 +1100 Subject: [PATCH 8/8] Update changelog to reflect LVM deprecation --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index dd2b5e9..8143232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ collectd (5.9.2-1) unstable; urgency=medium - Remove liblvm2app_depreciation_warning.patch i2c_detection.patch ; upstream * debian/control - Add re-enable varnish plugin ; upstream + - Remove lvm (deprecated); upstream - Update to phython3 (consistent with Debian updates @bzed https://salsa.debian.org/debian/pkg-collectd - Add libqpid-proton11-dev, libmosquitto-dev (modules) (consistent with Debian updates)