Merge branch 'master' into m-p
Conflicts: debian/control
This commit is contained in:
commit
3d682f2570
4
debian/changelog
vendored
4
debian/changelog
vendored
|
@ -8,8 +8,8 @@ nagios-plugins (1.5-3) unstable; urgency=medium
|
|||
|
||||
* [38d8f67] Fixing latest changelog timestamp
|
||||
* [7091aae] check_ssh: Drop 12_check_ssh_read_socket.dpatch
|
||||
(Closes: #734811), this seems to make more touble in the wild as fixing
|
||||
#739254, Thanks Jim Barber
|
||||
(Closes: #734811, #739254), this seems to make more touble in the wild as
|
||||
fixing #739254, Thanks Jim Barber
|
||||
|
||||
-- Jan Wagner <waja@cyconet.org> Mon, 17 Feb 2014 12:42:06 +0100
|
||||
|
||||
|
|
3
debian/control
vendored
3
debian/control
vendored
|
@ -37,8 +37,7 @@ Description: Common files for plugins for nagios compatible monitoring
|
|||
|
||||
Package: monitoring-plugins-basic
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any], ucf
|
||||
Pre-Depends: monitoring-plugins-common
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, monitoring-plugins-common, procps, iputils-ping [linux-any], inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any], ucf
|
||||
Replaces: nagios-plugins-basic (<< 1.6-1~)
|
||||
Breaks: nagios-plugins-basic (<< 1.6-1~)
|
||||
Suggests: nagios3 | icinga
|
||||
|
|
1
debian/rules
vendored
1
debian/rules
vendored
|
@ -108,6 +108,7 @@ config.status: configure
|
|||
--with-snmpgetnext-command="/usr/bin/snmpgetnext" \
|
||||
--with-qstat-command="/usr/bin/quakestat" \
|
||||
--with-fping-command="/usr/bin/fping" \
|
||||
--with-fping6-command="/usr/bin/fping6" \
|
||||
--with-ssh-command="/usr/bin/ssh" \
|
||||
--with-mailq-command="/usr/bin/mailq" \
|
||||
--with-proc-meminfo="/proc/meminfo" \
|
||||
|
|
Loading…
Reference in a new issue