[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.7.0-4-5-gbcba7da
Alexander Wirt
formorer at debian.org
Mon Jun 18 16:53:48 UTC 2012
The following commit has been merged in the master branch:
commit bcba7da96a750e5b6a3d81196ac981d38cd012b1
Author: Alexander Wirt <formorer at debian.org>
Date: Mon Jun 18 18:44:06 2012 +0200
80_fix_typos_in_eventhandlers is now upstream
diff --git a/debian/patches/00list b/debian/patches/00list
index 98c43fc..85a981e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,5 @@
51_commands.cfg-debianize.dpatch
52_icinga.cfg-debianize.dpatch
70_fix_eventhandler_paths.dpatch
-80_fix_typos_in_eventhandlers.dpatch
90_disable_standard_conforming_strings.dpatch
95_fix_db_upgrade.dpatch
diff --git a/debian/patches/80_fix_typos_in_eventhandlers.dpatch b/debian/patches/80_fix_typos_in_eventhandlers.dpatch
deleted file mode 100755
index 2191d17..0000000
--- a/debian/patches/80_fix_typos_in_eventhandlers.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix_typos_in_eventhandlers.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event pkg-icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
---- pkg-icinga~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2012-06-09 07:47:13.000000000 +0200
-+++ pkg-icinga/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2012-06-09 07:48:02.935115129 +0200
-@@ -45,7 +45,7 @@
- # We should go back to being the slave host,
- # so disable active checks
-
-- `eventhandlerdir/disable_active_service_checks`
-+ `$eventhandlerdir/disable_active_service_checks`
- ;;
-
- esac
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list