[Pkg-nagios-changes] [SCM] debian packaging of PNP4Nagios branch, master, updated. v_0_6_11-2-12-g4935556

[Sebastian Harl]

The following commit has been merged in the master branch:
commit fe60219c8d9476cc09ac6bcd8f73c694daa31151
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Apr 26 13:08:17 2011 +0200

    patches/: Removed raise-process-perfdata-timeout.
    
    A similar patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index fdbf7a2..fb6e8ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 pnp4nagios (0.6.12-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches/:
+    - Removed raise-process-perfdata-timeout -- a similar patch has been
+      included upstream.
 
- -- Sebastian Harl <tokkee at debian.org>  Tue, 26 Apr 2011 13:01:50 +0200
+ -- Sebastian Harl <tokkee at debian.org>  Tue, 26 Apr 2011 13:07:42 +0200
 
 pnp4nagios (0.6.11-2) unstable; urgency=low
 
diff --git a/debian/patches/raise-process-perfdata-timeout b/debian/patches/raise-process-perfdata-timeout
deleted file mode 100644
index 6c34cd8..0000000
--- a/debian/patches/raise-process-perfdata-timeout
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Set timeout to 10s in process_perfdata.cfg.
- In large and/or virtualized setups, 5s might not be enough.
-Author: Sven Velt <sven at velt.de>
-Forwarded: not-needed
-
---- a/sample-config/pnp/process_perfdata.cfg-sample.in
-+++ b/sample-config/pnp/process_perfdata.cfg-sample.in
-@@ -6,7 +6,7 @@
- #
- # process_perfdata.pl Timeout in seconds 
- #
--TIMEOUT = 5
-+TIMEOUT = 10
- 
- #
- # Use RRDs Perl module
diff --git a/debian/patches/series b/debian/patches/series
index 8214a08..78f6972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 fix-path-fpdi
 apache-fix-path-to-userfile
-raise-process-perfdata-timeout
 fix-npcd-path
 fix-nagios-url
 adjust-template-path

-- 
debian packaging of PNP4Nagios