[Pkg-nagios-changes] [pkg-nagios] r1885 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

Author: waja
Date: 2010-04-09 19:48:42 +0000 (Fri, 09 Apr 2010)
New Revision: 1885

Removed:
   nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
   nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch
Log:
Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-04-09 19:40:00 UTC (rev 1884)
+++ nagios-plugins/trunk/debian/changelog	2010-04-09 19:48:42 UTC (rev 1885)
@@ -8,6 +8,7 @@
     - 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
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2010-04-09 19:40:00 UTC (rev 1884)
+++ nagios-plugins/trunk/debian/patches/00list	2010-04-09 19:48:42 UTC (rev 1885)
@@ -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

Modified: nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch	2010-04-09 19:40:00 UTC (rev 1884)
+++ nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch	2010-04-09 19:48:42 UTC (rev 1885)
@@ -23,3 +23,15 @@
  }
  
  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

Deleted: nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch	2010-04-09 19:40:00 UTC (rev 1884)
+++ nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch	2010-04-09 19:48:42 UTC (rev 1885)
@@ -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