[Pkg-nagios-devel] nagios-plugins/debian/patches 00list, 1.1, 1.2 08_subst.dpatch, 1.1, 1.2

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios-plugins/debian/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv7620/debian/patches

Modified Files:
	00list 08_subst.dpatch 
Log Message:
massaged old patches to work.
removed some build-dependencies and hard-coded paths instead


Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/patches/00list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 00list	30 Sep 2005 13:15:15 -0000	1.1
+++ 00list	3 Oct 2005 07:40:32 -0000	1.2
@@ -1,4 +1,4 @@
 02_utilspm
 06_checkircd
 08_subst
-09_pssyntax
+10_config.h_debiandefaults.dpatch

Index: 08_subst.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/patches/08_subst.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 08_subst.dpatch	30 Sep 2005 13:15:15 -0000	1.1
+++ 08_subst.dpatch	3 Oct 2005 07:40:32 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad nagios-plugins-1.3.1.0/plugins-scripts/subst.in /tmp/dpep.bslXbi/nagios-plugins-1.3.1.0/plugins-scripts/subst.in
---- nagios-plugins-1.3.1.0/plugins-scripts/subst.in	2004-10-13 13:58:07.000000000 -0700
-+++ /tmp/dpep.bslXbi/nagios-plugins-1.3.1.0/plugins-scripts/subst.in	2004-10-13 13:59:26.000000000 -0700
+diff -urNad sid~/plugins-scripts/subst.in sid/plugins-scripts/subst.in
+--- sid~/plugins-scripts/subst.in	2005-10-03 03:08:11.000000000 -0400
++++ sid/plugins-scripts/subst.in	2005-10-03 03:14:09.000000000 -0400
 @@ -1,35 +1,37 @@
  #!/usr/bin/awk
  
@@ -72,21 +72,17 @@
  }
  
  BEGIN {
-@@ -60,13 +62,14 @@
- 
- # Specific programs
- 
-+# They are already correct, it seems... don't bother with this!
+@@ -62,11 +64,11 @@
+ # subst will replace the fully qualified command with whatever is
+ # returned from the which subroutine
  #
 -/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
 -	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
--	start=RSTART+RLENGTH;
 -	c=substr($0,RSTART,RLENGTH);
 -	sub(c,which(c,path));
 -}
 +#/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
 +#	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-+#	start=RSTART+RLENGTH;
 +#	c=substr($0,RSTART,RLENGTH);
 +#	sub(c,which(c,path));
 +#}