[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.4.2-1-12-g359b994

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 13699c056b906e1d237a0d61bbbdaa58225e0462
Author: Alexander Wirt <formorer at grml.org>
Date:   Thu Aug 25 13:10:55 2011 +0200

    Remove 60_fix_p1.pl_patch_mini_epn (now handled in configure)

diff --git a/debian/patches/00list b/debian/patches/00list
index 3d301af..20a8b4e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,5 @@
 51_commands.cfg-debianize.dpatch
 52_icinga.cfg-debianize.dpatch
 55_idoutils-debianize
-60_fix_p1.pl_patch_mini_epn.dpatch
 70_fix_eventhandler_paths.dpatch
 96_add_mootols_more.dpatch
diff --git a/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch b/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
deleted file mode 100755
index ac5a627..0000000
--- a/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_fix_p1.pl_patch_mini_epn.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Call p1.pl from /usr/lib/nagios3 
-
- at DPATCH@
-diff -urNad nagios3-3.0.3~/contrib/mini_epn.c nagios3-3.0.3/contrib/mini_epn.c
---- nagios3-3.0.3~/contrib/mini_epn.c	2005-11-15 01:49:36.000000000 +0000
-+++ nagios3-3.0.3/contrib/mini_epn.c	2008-07-18 19:59:37.000000000 +0000
-@@ -17,7 +17,7 @@
- #endif
- */
- 
--	char *embedding[] = { "", "p1.pl" };
-+	char *embedding[] = { "", "/usr/lib/icinga/p1.pl" };
- 	char *plugin_output ;
- 	char fname[64];
- 	char *args[] = {"","0", "", "", NULL };
diff --git a/debian/rules b/debian/rules
index 284b961..97e2f6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ CONFIGURE	= CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \
 				--host=$(DEB_HOST_GNU_TYPE) \
 				--with-htmurl=/icinga \
 				--with-cgiurl=/cgi-bin/icinga \
+				--with-p1-file-dir=/usr/lib/icinga/p1.pl \
 				--enable-idoutils
 
 clean: clean-patched unpatch

-- 
debian packaging of icinga(-core)