collectd · zebity · Sep 23, 2019 · Sep 23, 2019 · Sep 24, 2019 · Sep 24, 2019
diff --git a/debian/NEWS.Debian → debian/NEWS b/debian/NEWS.Debian → debian/NEWS
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,21 @@
+collectd (5.9.2-1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * 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
+    - 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)
+
+ -- zebity spring <[email protected]>  Sun, 22 Sep 2019 21:55:00 +1000
+
 collectd (5.8.1-1) unstable; urgency=medium
 
   * New upstream release.

diff --git 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
  <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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
  <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
 
 Template: collectd/postrm_purge_data

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <[email protected]>
-Uploaders: Marc Fournier <[email protected]>
+Uploaders: Marc Fournier <[email protected]>, Bernd Zeimetz <[email protected]>
 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,
@@ -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,
@@ -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/patches/i2c_detection.patch b/debian/patches/i2c_detection.patch
diff --git a/debian/patches/liblvm2app_depreciation_warning.patch b/debian/patches/liblvm2app_depreciation_warning.patch
diff --git 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/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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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
@@ -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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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å "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for detaljer."
 
 #. Type: boolean

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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 <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
 "für Details."
 

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
 

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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 "
 "(<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>) pour plus de "
 "détails."
 

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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 <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
 "para obter máis detalles."
 

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
 

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
 msgstr ""
-"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz 及び collectd wiki "
+"詳細については /usr/share/doc/collectd-core/NEWS.gz 及び collectd wiki "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> を見てください。"
 
 #. Type: boolean

diff --git 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 "
 "<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> 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, <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>, "
 "voor meer informatie."