patches/: Removed raise-process-perfdata-timeout.

A similar patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index fdbf7a2e74c1333f2eebb660c0835e6a3dc4b4d3..fb6e8ace5dd935c5713d1a546db3955daf9555c3 100644 (file)
--- 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@debian.org>  Tue, 26 Apr 2011 13:01:50 +0200
+ -- Sebastian Harl <tokkee@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 (file)
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@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 8214a08b36a9d1e95a3f4bedce77e9426c157ff8..78f6972ac54b037bcbb4ea03406f5d82c208c820 100644 (file)
--- 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