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

[Jan Wagner]

Author: waja
Date: 2010-05-08 23:27:16 +0000 (Sat, 08 May 2010)
New Revision: 1900

Added:
   nagios-plugins/trunk/debian/patches/01_subst.in.dpatch
Removed:
   nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
rename 13_subst.in_again.dpatch to 01_subst.in.dpatch

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-05-08 20:22:50 UTC (rev 1899)
+++ nagios-plugins/trunk/debian/changelog	2010-05-08 23:27:16 UTC (rev 1900)
@@ -1,6 +1,6 @@
 nagios-plugins (1.4.14-6) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Rename 13_subst.in_again.dpatch to 01_subst.in.dpatch
 
  -- Jan Wagner <waja at cyconet.org>  Sat, 08 May 2010 22:22:24 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2010-05-08 20:22:50 UTC (rev 1899)
+++ nagios-plugins/trunk/debian/patches/00list	2010-05-08 23:27:16 UTC (rev 1900)
@@ -1,7 +1,8 @@
+01_subst.in.dpatch
 02_check_icmp_links.dpatch
+# commited upstream
 03_check_smtp_help.dpatch
 06_checkircd.dpatch
-13_subst.in_again.dpatch
 18_check_game_cmdline.dpatch
 22_check_smb_hostaddress.dpatch
 32_check_ldap_pointer.dpatch

Copied: nagios-plugins/trunk/debian/patches/01_subst.in.dpatch (from rev 1896, nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch)
===================================================================
--- nagios-plugins/trunk/debian/patches/01_subst.in.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/01_subst.in.dpatch	2010-05-08 23:27:16 UTC (rev 1900)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_subst.in.dpatch by  <seanius at localhost.localdomain>
+##
+## DP: Use /usr/lib/nagios/plugins as 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

Deleted: nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch	2010-05-08 20:22:50 UTC (rev 1899)
+++ nagios-plugins/trunk/debian/patches/13_subst.in_again.dpatch	2010-05-08 23:27:16 UTC (rev 1900)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_subst.in_again.dpatch by  <seanius at localhost.localdomain>
-##
-## DP: Use /usr/lib/nagios/plugins as 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