[Pkg-nagios-changes] [pkg-nagios-plugins] 240/413: Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 07d3a6257395381b7de01ae174a865e8d2b8442d
Author: Jan Wagner <waja at cyconet.org>
Date:   Fri Apr 9 19:48:42 2010 +0000

    Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch
---
 debian/changelog                        |  1 +
 debian/patches/00list                   |  1 -
 debian/patches/13_subst.in_again.dpatch | 12 ++++++++++++
 debian/patches/38_fix_libexec.dpatch    | 18 ------------------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eeb49bc..78270fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ nagios-plugins (1.4.14-5) UNRELEASED; urgency=low
     - 27_check_radius_segfault.dpatch: check_radius.c:161 initializes "data" to
       0 using memset(3) and problem not longer reproducable on amd64 without
       the patch
+  * Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 08 Apr 2010 23:54:05 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 2620527..f87a611 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,7 +10,6 @@
 35_check_http_date.dpatch
 36_check_ldap_empty_base.dpatch
 37_check_radius_nas-ip-address.dpatch
-38_fix_libexec.dpatch
 39_check_ircd_fix_epn.dpatch
 40_check_http_proxy_auth.dpatch
 41_check_ping_detect_args.dpatch
diff --git a/debian/patches/13_subst.in_again.dpatch b/debian/patches/13_subst.in_again.dpatch
index 2ef8e2e..cb13a24 100755
--- a/debian/patches/13_subst.in_again.dpatch
+++ b/debian/patches/13_subst.in_again.dpatch
@@ -23,3 +23,15 @@ diff -urNad nagios-plugins-1.4.13+git200906171200~/plugins-scripts/subst.in nagi
  }
  
  BEGIN {
+diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl
+--- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
++++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl	2008-06-06 16:16:23.000000000 +0200
+@@ -23,7 +23,7 @@
+ #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+ 
+ use strict;
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ use utils qw(%ERRORS);
+ 
+ # die with an error if we're not on Linux
diff --git a/debian/patches/38_fix_libexec.dpatch b/debian/patches/38_fix_libexec.dpatch
deleted file mode 100755
index 67020b6..0000000
--- a/debian/patches/38_fix_libexec.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 38_fix_libexec.dpatch by Jan Wagner <waja at cyconet.org>
-##
-## DP: fix library path
-
- at DPATCH@
-diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl
---- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
-+++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl	2008-06-06 16:16:23.000000000 +0200
-@@ -23,7 +23,7 @@
- #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
- 
- use strict;
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS);
- 
- # die with an error if we're not on Linux

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git