[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-3-9-g2ebdf35

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 6751776104e7a7908dcf367daae34d24700eeffb
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri May 11 23:04:02 2012 +0200

    Remove obsolete patch

diff --git a/debian/patches/00list b/debian/patches/00list
index de6e3b7..0c5a3c1 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,7 +1,6 @@
 50_cgi.cfg-debianize.dpatch
 51_commands.cfg-debianize.dpatch
 52_icinga.cfg-debianize.dpatch
-55_idoutils-debianize
 70_fix_eventhandler_paths.dpatch
 80_fix_tac_json
 90_disable_standard_conforming_strings.dpatch
diff --git a/debian/patches/55_idoutils-debianize.dpatch b/debian/patches/55_idoutils-debianize.dpatch
deleted file mode 100755
index 369bb2e..0000000
--- a/debian/patches/55_idoutils-debianize.dpatch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_idoutils-debianize.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: debianize idoutils
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/module/idoutils/config/ido2db.cfg-sample.in icinga-1.0.2~pre20100626/module/idoutils/config/ido2db.cfg-sample.in
---- icinga-1.0.2~pre20100626~/module/idoutils/config/ido2db.cfg-sample.in	2010-06-25 13:12:03.000000000 +0200
-+++ icinga-1.0.2~pre20100626/module/idoutils/config/ido2db.cfg-sample.in	2010-06-26 11:07:09.473927242 +0200
-@@ -8,7 +8,7 @@
- # This is the lockfile that IDO2DB will use to store its PID number
- # in when it is running in daemon mode.
- 
--lock_file=@localstatedir@/ido2db.lock
-+lock_file=/var/run/icinga/ido2db.pid
- 
- 
- 
-@@ -236,7 +236,7 @@
- # DEBUG FILE
- # This option determines where the daemon should write debugging information.
- 
--debug_file=@localstatedir@/ido2db.debug
-+debug_file=/var/log/icinga/ido2db.debug
- 
- 
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/module/idoutils/config/idomod.cfg-sample.in icinga-1.0.2~pre20100626/module/idoutils/config/idomod.cfg-sample.in
---- icinga-1.0.2~pre20100626~/module/idoutils/config/idomod.cfg-sample.in	2010-06-25 13:12:03.000000000 +0200
-+++ icinga-1.0.2~pre20100626/module/idoutils/config/idomod.cfg-sample.in	2010-06-26 11:07:09.473927242 +0200
-@@ -229,7 +229,7 @@
- # DEBUG FILE
- # This option determines where the daemon should write debugging information.
- 
--debug_file=@localstatedir@/idomod.debug
-+debug_file=/var/log/icinga/idomod.debug
- 
- 
- 

-- 
debian packaging of icinga(-core)