diff --git a/debian/changelog b/debian/changelog index 791681b..134ffa2 100644 --- a/debian/changelog +++ b/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 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 Thu, 02 Feb 2014 22:11:48 +0100 + -- Jan Wagner 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_ commands for all supported mtas (closes: #281016, #282015) + * Add check_mailq_ 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 Sun, 1 Feb 2004 10:32:04 +0100 - diff --git a/debian/compat b/debian/compat index 7ed6ff8..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +10 diff --git a/debian/control b/debian/control index 9e781f3..c4f9933 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,12 @@ Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: autotools-dev, - debhelper (>= 5), +Build-Depends: debhelper (>= 10~), 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 diff --git a/debian/gbp.conf b/debian/gbp.conf index 5d84e2e..b5fd342 100644 --- a/debian/gbp.conf +++ b/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 diff --git a/debian/monitoring-plugins-common.links b/debian/monitoring-plugins-common.links deleted file mode 100644 index 4ccd699..0000000 --- a/debian/monitoring-plugins-common.links +++ /dev/null @@ -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 diff --git a/debian/pluginconfig/snmp.cfg b/debian/pluginconfig/snmp.cfg index 2be8f8e..21442ed 100644 --- a/debian/pluginconfig/snmp.cfg +++ b/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 } diff --git a/debian/rules b/debian/rules index 72f2ac7..6add2d1 100755 --- a/debian/rules +++ b/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) -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 +include /usr/share/dpkg/architecture.mk DEBIANDIR=$(CURDIR)/debian NP_LIBEXEC:=/usr/lib/nagios/plugins diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..a11336b --- /dev/null +++ b/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 diff --git a/debian/watch b/debian/watch index 111ca35..534f948 100644 --- a/debian/watch +++ b/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