[Pkg-nagios-changes] [pkg-monitoring-plugins] 32/51: Merge branch 'master' into m-p

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit 3d682f2570f566a442a101f2867dab777ce07fe1
Merge: 9939d1f 4580974
Author: Jan Wagner <waja at cyconet.org>
Date:   Sat Jun 21 13:53:42 2014 +0200

    Merge branch 'master' into m-p
    
    Conflicts:
    	debian/control

 debian/changelog | 4 ++--
 debian/control   | 3 +--
 debian/rules     | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/control
index 6363c4e,84957de..bc22305
--- a/debian/control
+++ b/debian/control
@@@ -35,12 -32,11 +35,11 @@@ Description: Common files for plugins f
   .
   This package contains common files which maybe needed for plugins.
  
 -Package: nagios-plugins-basic
 +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}, nagios-plugins-common (>= 1.4.15-6), procps, iputils-ping [linux-any], inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any], ucf
 -Conflicts: nagios-plugins (<= 1.4.2-3)
 -Replaces: nagios-plugins, nagios-plugins-standard
++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
  Description: Plugins for nagios compatible monitoring systems
   Plugins for nagios compatible monitoring systems like Nagios and Icinga. It

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git