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

[Jan Wagner]

Author: waja
Date: 2010-04-09 20:07:04 +0000 (Fri, 09 Apr 2010)
New Revision: 1886

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch
Log:
drop some more obsolete stuff

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-04-09 19:48:42 UTC (rev 1885)
+++ nagios-plugins/trunk/debian/changelog	2010-04-09 20:07:04 UTC (rev 1886)
@@ -8,7 +8,8 @@
     - 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
+  * Drop 13_subst.in_again.dpatch and move 38_fix_libexec.dpatch to
+    13_subst.in_again.dpatch
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 08 Apr 2010 23:54:05 +0200
 

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:48:42 UTC (rev 1885)
+++ nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch	2010-04-09 20:07:04 UTC (rev 1886)
@@ -4,25 +4,6 @@
 ## DP: Use /usr/lib/nagios/plugins as path.
 
 @DPATCH@
-diff -urNad nagios-plugins-1.4.13+git200906171200~/plugins-scripts/subst.in nagios-plugins-1.4.13+git200906171200/plugins-scripts/subst.in
---- nagios-plugins-1.4.13+git200906171200~/plugins-scripts/subst.in	2009-05-20 06:44:12.000000000 +0200
-+++ nagios-plugins-1.4.13+git200906171200/plugins-scripts/subst.in	2009-06-22 17:08:55.000000000 +0200
-@@ -22,14 +22,7 @@
- # used to replace "use lib utils.pm" with "use lib @libexecdir"
- #
- function led() {
--	led1 = "@libexecdir@";
--	led2 = "@exec_prefix@";
--	led3 = "@prefix@";
--	if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
--		return "\"" led3 "/libexec\" " ;
--	
--	}
--	return "\"" led1 "\"" ;
-+	return "\"/usr/lib/nagios/plugins\"" ;
- }
- 
- 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