Cleaned up and documented patches.

diff --git a/debian/patches/adjust-template-path b/debian/patches/adjust-template-path
index 7c2abe4a98d41ee7a0f1da0dd4e285308d061173..8ef4ae97fa530e5e6964166ca61aeaec24993acf 100644 (file)
--- a/debian/patches/adjust-template-path
+++ b/debian/patches/adjust-template-path
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/sample-config/pnp/config.php.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/pnp/config.php.in        2011-01-24 23:37:42.251054015 +0100
-+++ pkg-pnp4nagios/sample-config/pnp/config.php.in     2011-01-24 23:38:08.707054015 +0100
+Description: Install templates into /etc/ rather than /usr/share/.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
 @@ -214,12 +214,12 @@
  # Add your own template directories here
  # First match wins!

diff --git a/debian/patches/apache-fix-path-to-userfile b/debian/patches/apache-fix-path-to-userfile
index cb1f310af3fe3596f7cfa4f23fc9af5671f5b60d..1e10b85b57f59af3f67a6e4d467e2e966bf1d52b 100644 (file)
--- a/debian/patches/apache-fix-path-to-userfile
+++ b/debian/patches/apache-fix-path-to-userfile
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/sample-config/httpd.conf.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/httpd.conf.in    2011-01-26 14:40:26.943054015 +0100
-+++ pkg-pnp4nagios/sample-config/httpd.conf.in 2011-01-26 14:40:40.599054016 +0100
+Description: Fix config directory in the sample httpd.conf.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/httpd.conf.in
++++ b/sample-config/httpd.conf.in
 @@ -11,7 +11,7 @@
        #
        AuthName "Nagios Access"

diff --git a/debian/patches/fix-nagios-url b/debian/patches/fix-nagios-url
index f3a09d9f8e984a6706947eb30bf62ed72c153b44..27568d74b09549833eab92a726e8e95daded11ef 100644 (file)
--- a/debian/patches/fix-nagios-url
+++ b/debian/patches/fix-nagios-url
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/sample-config/pnp/config.php.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/pnp/config.php.in        2011-01-26 14:17:43.971054016 +0100
-+++ pkg-pnp4nagios/sample-config/pnp/config.php.in     2011-01-26 14:17:57.167054016 +0100
+Description: Fix cgi-bin path in config.php.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
 @@ -73,7 +73,7 @@
  #
  # Link back to Nagios or Thruk ( www.thruk.org ) 

diff --git a/debian/patches/fix-npcd-path b/debian/patches/fix-npcd-path
index 404f1861f6460d25aab0f9a0343b0b12d7764595..e53b5365359d0a43e4790bcf10873adb14d3d66c 100644 (file)
--- a/debian/patches/fix-npcd-path
+++ b/debian/patches/fix-npcd-path
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/sample-config/pnp/npcd.cfg-sample.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/pnp/npcd.cfg-sample.in   2011-01-26 14:33:43.595054016 +0100
-+++ pkg-pnp4nagios/sample-config/pnp/npcd.cfg-sample.in        2011-01-26 14:36:53.351054016 +0100
+Description: Fix perfdata paths in npcd.cfg.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/pnp/npcd.cfg-sample.in
++++ b/sample-config/pnp/npcd.cfg-sample.in
 @@ -76,7 +76,7 @@
  # perfdata_spool_dir = </path/to/directory/>
  #

diff --git a/debian/patches/fix-path-fpdi b/debian/patches/fix-path-fpdi
index ce5c8d9158d9de24bf921683314e91c6e2443da6..23bf9d67bca76280fab160738b0ba6c1a62f6d86 100644 (file)
--- a/debian/patches/fix-path-fpdi
+++ b/debian/patches/fix-path-fpdi
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/share/pnp/application/controllers/pdf.php
-===================================================================
---- pkg-pnp4nagios.orig/share/pnp/application/controllers/pdf.php      2011-01-26 14:46:34.895054016 +0100
-+++ pkg-pnp4nagios/share/pnp/application/controllers/pdf.php   2011-01-26 14:46:45.583054015 +0100
+Description: FPDI is shipped in its own subdirectory -- adopt path in pdf.php.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/share/pnp/application/controllers/pdf.php
++++ b/share/pnp/application/controllers/pdf.php
 @@ -267,7 +267,7 @@
  *
  */

diff --git a/debian/patches/raise-process-perfdata-timeout b/debian/patches/raise-process-perfdata-timeout
index 9a6628b55f8b8e898ab86997a2920c33795f8166..c01e72fe37670e2f84c0f941dc9721b4abf98c24 100644 (file)
--- a/debian/patches/raise-process-perfdata-timeout
+++ b/debian/patches/raise-process-perfdata-timeout
@@ -1,7 +1,9 @@
-Index: pkg-pnp4nagios/sample-config/pnp/process_perfdata.cfg-sample.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/pnp/process_perfdata.cfg-sample.in       2011-01-26 14:39:08.995054016 +0100
-+++ pkg-pnp4nagios/sample-config/pnp/process_perfdata.cfg-sample.in    2011-01-26 14:39:14.327054015 +0100
+Description: Set timeout to 10s in process_perfdata.cfg.
+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