Merge branch 'master' of salsa.debian.org:nagios-team/pkg-monitoring-plugins into development

debian/changelog

@@ -1,7 +1,18 @@
 monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium
 
+  [ Jan Wagner ]
   * UNRELEASED
 
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Wrap long lines in changelog entries: 1.4-1.
+  * Bump debhelper from deprecated 5 to 10.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from
+    ./configure), Repository, Repository-Browse.
+  * Rely on pre-initialized dpkg-architecture variables.
+  * Fix day-of-week for changelog entry 1.5-2.
+  * Update standards version to 4.5.0, no changes needed.
+
  -- Jan Wagner <waja@cyconet.org>  Wed, 17 Apr 2019 08:17:55 +0200
 
 monitoring-plugins (2.2-6) unstable; urgency=medium
@@ -328,7 +339,7 @@ nagios-plugins (1.5-2) unstable; urgency=medium
     - libfreeradius-client-dev is actually not supported by upstream
     - check_radius
 
- -- Jan Wagner <waja@cyconet.org>  Thu, 02 Feb 2014 22:11:48 +0100
+ -- Jan Wagner <waja@cyconet.org>  Sun, 02 Feb 2014 22:11:48 +0100
 
 nagios-plugins (1.5-1) unstable; urgency=medium
 
@@ -1376,7 +1387,8 @@ nagios-plugins (1.4-1) unstable; urgency=low
   * Add check_dig command (closes: #281020)
   * Add check_breeze command (closes: #281019)
   * Add dummy commands (closes: #281018)
-  * Add check_mailq_<MTA> commands for all supported mtas (closes: #281016, #282015)
+  * Add check_mailq_<MTA> commands for all supported mtas (closes: #281016,
+    #282015)
   * Add check_spop and check_simap commands (closes: #280700)
   * Add check_nt command (closes: #294299)
   * Fix check_load command (closes: #294298)
@@ -1543,4 +1555,3 @@ nagios-plugins (1.3.1-1) unstable; urgency=low
     is not so terrible
 
  -- Guido Trotter <ultrotter@debian.org>  Sun,  1 Feb 2004 10:32:04 +0100
-

debian/compat

@@ -1 +1 @@
-5
+10

debian/control

@@ -3,13 +3,12 @@ Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
 Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>
-Build-Depends: autotools-dev,
+Build-Depends: debhelper (>= 10~),
-               debhelper (>= 5),
                libdbi-dev,
                libradcli-dev | libfreeradius-client-dev | libradiusclient-ng-dev,
                libkrb5-dev,
                libldap2-dev,
-               default-libmysqlclient-dev | libmysqlclient-dev,
+               default-libmysqlclient-dev,
                libnet-snmp-perl,
                libpq-dev,
                libssl-dev,
@@ -19,12 +18,12 @@ Build-Depends: autotools-dev,
 Homepage: https://www.monitoring-plugins.org
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins.git
-Standards-Version: 4.3.0
+Standards-Version: 4.5.1
 
 Package: monitoring-plugins
 Architecture: all
 Depends: monitoring-plugins-basic, monitoring-plugins-standard, ${misc:Depends}
-Suggests: icinga | icinga2, nagios-plugins-contrib
+Suggests: icinga2, nagios-plugins-contrib
 Provides: nagios-plugins
 Description: Plugins for nagios compatible monitoring systems (metapackage)
  Plugins for nagios compatible monitoring systems like Naemon and Icinga.
@@ -38,7 +37,7 @@ Description: Plugins for nagios compatible monitoring systems (metapackage)
 Package: monitoring-plugins-common
 Architecture: any
 Depends: ucf, ${misc:Depends}, ${shlibs:Depends}
-Suggests: icinga | icinga2
+Suggests: icinga2
 Description: Common files for plugins for nagios compatible monitoring
  Common files for plugins for nagios compatible monitoring systems like Naemon
  and Icinga.
@@ -55,7 +54,7 @@ Depends: inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any],
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libcap2-bin [linux-any]
-Suggests: icinga | icinga2
+Suggests: icinga2
 Provides: nagios-plugins-basic
 Description: Plugins for nagios compatible monitoring systems (basic)
  Plugins for nagios compatible monitoring systems like Naemon and Icinga. It
@@ -91,7 +90,7 @@ Recommends: bind9-host | host,
             sudo,
             ${shlibs:Recommends}
 Suggests: fping,
-          icinga | icinga2,
+          icinga2,
           postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light,
           qstat
 Provides: nagios-plugins-standard

debian/gbp.conf

@@ -1,2 +1,3 @@
-[git-buildpackage]
+[buildpackage]
 postbuild = lintian --info --display-info --display-experimental --pedantic --show-overrides $GBP_CHANGES_FILE
+pbuilder-options = --source-only-changes

debian/monitoring-plugins-common.links

@@ -1,2 +0,0 @@
-usr/lib/nagios/plugins/utils.pm usr/lib/icinga/utils.pm
-usr/lib/nagios/plugins/utils.sh usr/lib/icinga/utils.sh

debian/pluginconfig/snmp.cfg

@@ -50,7 +50,7 @@ define command{
 # 'snmp_users' command definition
 define command{
 	command_name	snmp_users
-	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers -w :'$ARG2$' -c :'$ARG3$' -l users
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers.0 -w :'$ARG2$' -c :'$ARG3$' -l users
 	}
 
 

debian/rules

@@ -14,11 +14,7 @@ PACKAGE = monitoring-plugins
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-CFLAGS = -Wall -g
 
 DEBIANDIR=$(CURDIR)/debian
 NP_LIBEXEC:=/usr/lib/nagios/plugins

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: monitoring-plugins
+Bug-Database: https://github.com/monitoring-plugins/monitoring-plugins/issues
+Bug-Submit: https://github.com/monitoring-plugins/monitoring-plugins/issues/new
+Repository: https://github.com/monitoring-plugins/monitoring-plugins.git
+Repository-Browse: https://github.com/monitoring-plugins/monitoring-plugins

debian/watch

@@ -1,3 +1,3 @@
-version=3
+version=4
 https://www.monitoring-plugins.org/download/.*-plugins-(\d+\.[\d\.a-z]+)\.tar\.gz \
   debian debian/bin/repack.sh