Merge branch 'master' into m-p

Conflicts:
	debian/control
This commit is contained in:
Jan Wagner 2014-06-21 13:53:42 +02:00
commit 3d682f2570
3 changed files with 4 additions and 4 deletions

3
debian/control vendored
View file

@ -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