[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.4.0-1-10-g8c5f1ab

[Alexander Wirt]

The following commit has been merged in the master branch:
commit e499f255aa35cfbabd78b8029faa941cac6a5c4f
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jun 8 22:17:27 2011 +0200

    Update 70_fix_eventhandler_paths.dpatch

diff --git a/debian/patches/70_fix_eventhandler_paths.dpatch b/debian/patches/70_fix_eventhandler_paths.dpatch
index 8295639..ad69eb4 100755
--- a/debian/patches/70_fix_eventhandler_paths.dpatch
+++ b/debian/patches/70_fix_eventhandler_paths.dpatch
@@ -5,30 +5,6 @@
 ## DP: Fixes paths for all contributed eventhandlers
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/disable_active_service_checks icinga/contrib/eventhandlers/disable_active_service_checks
---- icinga~/contrib/eventhandlers/disable_active_service_checks	2011-05-11 10:04:31.000000000 +0200
-+++ icinga/contrib/eventhandlers/disable_active_service_checks	2011-05-11 11:22:35.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- printfcmd="/usr/bin/printf"
- 
--CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/icinga/rw/icinga.cmd"
- 
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/disable_notifications icinga/contrib/eventhandlers/disable_notifications
---- icinga~/contrib/eventhandlers/disable_notifications	2011-05-11 10:04:31.000000000 +0200
-+++ icinga/contrib/eventhandlers/disable_notifications	2011-05-11 11:22:35.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- printfcmd="/usr/bin/printf"
- 
--CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/icinga/rw/icinga.cmd"
- 
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler icinga/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
 --- icinga~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2011-05-11 10:04:31.000000000 +0200
 +++ icinga/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2011-05-11 11:22:35.000000000 +0200
@@ -55,30 +31,6 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  IcingaHost="icingahost"
  
  # Fire the data off to the NSCA daemon using the send_nsca script 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/enable_active_service_checks icinga/contrib/eventhandlers/enable_active_service_checks
---- icinga~/contrib/eventhandlers/enable_active_service_checks	2011-05-11 10:04:31.000000000 +0200
-+++ icinga/contrib/eventhandlers/enable_active_service_checks	2011-05-11 11:22:35.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- printfcmd="/usr/bin/printf"
- 
--CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/icinga/rw/icinga.cmd"
- 
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/enable_notifications icinga/contrib/eventhandlers/enable_notifications
---- icinga~/contrib/eventhandlers/enable_notifications	2011-05-11 10:04:31.000000000 +0200
-+++ icinga/contrib/eventhandlers/enable_notifications	2011-05-11 11:22:35.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- printfcmd="/usr/bin/printf"
- 
--CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/icinga/rw/icinga.cmd"
- 
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
 --- icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2011-05-11 10:04:31.000000000 +0200
 +++ icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2011-05-11 11:22:35.000000000 +0200

-- 
debian packaging of icinga(-core)