[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. upstream/1.3.1-19-g35eaca1

[Alexander Wirt]

The following commit has been merged in the master branch:
commit b7dbe94936443ba9920984e53bc6985e905d4578
Author: Alexander Wirt <formorer at grml.org>
Date:   Wed May 11 11:23:13 2011 +0200

    Cleanup patch

diff --git a/debian/patches/70_fix_eventhandler_paths.dpatch b/debian/patches/70_fix_eventhandler_paths.dpatch
index c2ff290..8295639 100755
--- a/debian/patches/70_fix_eventhandler_paths.dpatch
+++ b/debian/patches/70_fix_eventhandler_paths.dpatch
@@ -5,9 +5,9 @@
 ## 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-1.0.2~/contrib/eventhandlers/disable_active_service_checks icinga-1.0.2/contrib/eventhandlers/disable_active_service_checks
---- icinga-1.0.2~/contrib/eventhandlers/disable_active_service_checks	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/disable_active_service_checks	2010-07-01 07:27:53.010548215 +0200
+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"
@@ -17,9 +17,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # 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-1.0.2~/contrib/eventhandlers/disable_notifications icinga-1.0.2/contrib/eventhandlers/disable_notifications
---- icinga-1.0.2~/contrib/eventhandlers/disable_notifications	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/disable_notifications	2010-07-01 07:28:12.857926063 +0200
+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"
@@ -29,9 +29,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # 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-1.0.2~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
---- icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2010-07-01 07:29:30.946507615 +0200
+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
 @@ -21,7 +21,7 @@
  #
  
@@ -41,9 +41,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # Convert the state string to the corresponding return code
  return_code=-1
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
---- icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2010-07-01 07:27:06.502426451 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca icinga/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- icinga~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2011-05-11 10:04:31.000000000 +0200
++++ icinga/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2011-05-11 11:22:35.000000000 +0200
 @@ -27,8 +27,8 @@
  
  printfcmd="/usr/bin/printf"
@@ -55,9 +55,9 @@ 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-1.0.2~/contrib/eventhandlers/enable_active_service_checks icinga-1.0.2/contrib/eventhandlers/enable_active_service_checks
---- icinga-1.0.2~/contrib/eventhandlers/enable_active_service_checks	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/enable_active_service_checks	2010-07-01 07:28:24.978596351 +0200
+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"
@@ -67,9 +67,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # 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-1.0.2~/contrib/eventhandlers/enable_notifications icinga-1.0.2/contrib/eventhandlers/enable_notifications
---- icinga-1.0.2~/contrib/eventhandlers/enable_notifications	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/enable_notifications	2010-07-01 07:28:56.146507770 +0200
+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"
@@ -79,9 +79,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  # 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-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
---- icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2010-07-01 07:27:06.502426451 +0200
+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
 @@ -9,10 +9,10 @@
  
  # Location of the echo and mail commands
@@ -95,9 +95,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  
  # Only take action on hard host states...
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
---- icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2010-07-01 07:27:06.502426451 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2011-05-11 10:04:31.000000000 +0200
++++ icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2011-05-11 11:22:35.000000000 +0200
 @@ -9,10 +9,10 @@
  
  # Location of the echo and mail commands
@@ -111,15 +111,3 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
  
  # Only take action on hard service states...
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/submit_check_result icinga-1.0.2/contrib/eventhandlers/submit_check_result.in
---- icinga-1.0.2~/contrib/eventhandlers/submit_check_result.in	2010-06-30 11:13:42.000000000 +0200
-+++ icinga-1.0.2/contrib/eventhandlers/submit_check_result.in	2010-07-01 07:28:40.350467222 +0200
-@@ -23,7 +23,7 @@
-  
- echocmd="/bin/echo"
-  
--CommandFile="/usr/local/icinga/var/rw/icinga.cmd"
-+CommandFile="/var/lib/icinga/rw/icinga.cmd"
-  
- # get the current date/time in seconds since UNIX epoch
- datetime=`date +%s`

-- 
debian packaging of icinga(-core)