[Pkg-nagios-changes] [pkg-nagios] r924 - in nagios2/trunk/debian: . patches

[Marc Haber]

Author: zugschlus
Date: 2006-05-29 13:27:46 +0000 (Mon, 29 May 2006)
New Revision: 924

Added:
   nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch
Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/patches/00list
   nagios2/trunk/debian/rules
Log:
  * Fix upstream syntax error in handle-master-proc-event script
call dh_installchangelogs for arch dependent packages


Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-05-29 13:02:01 UTC (rev 923)
+++ nagios2/trunk/debian/changelog	2006-05-29 13:27:46 UTC (rev 924)
@@ -12,6 +12,7 @@
     cgi-lib policy having been reverted)
   * Fix short description of nagios2/adminpassword-mismatch to make
     lintian happy.
+  * Fix upstream syntax error in handle-master-proc-event script
 
   [sean finney]
   * posterity:  the previous release 2.3-1 also included a fix for
@@ -23,7 +24,7 @@
   * remove "do not translate" remark and incorporate Christian Perrier's
     suggested modifications to the debconf templates (closes: #352771).
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 29 May 2006 13:01:24 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 29 May 2006 13:20:10 +0000
 
 nagios2 (2.3-1) unstable; urgency=high
 

Modified: nagios2/trunk/debian/patches/00list
===================================================================
--- nagios2/trunk/debian/patches/00list	2006-05-29 13:02:01 UTC (rev 923)
+++ nagios2/trunk/debian/patches/00list	2006-05-29 13:27:46 UTC (rev 924)
@@ -1 +1,2 @@
 10no-strip
+20-handle-master-proc-event

Added: nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch
===================================================================
--- nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch	2006-05-29 13:02:01 UTC (rev 923)
+++ nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch	2006-05-29 13:27:46 UTC (rev 924)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-handle-master-proc-event.dpatch by Marc Haber <mh+debian-packages at zugschlus.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event trunk/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- trunk~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2002-02-26 04:03:37.000000000 +0000
++++ trunk/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2006-05-29 13:19:06.000000000 +0000
+@@ -31,8 +31,7 @@
+ 		`$eventhandlerdir/enable_active_service_checks`
+ 		;;
+ 
+-	WARNING)
+-	UNKNOWN)
++	WARNING|UNKNOWN)
+ 
+ 		# The master Nagios process may or may not
+ 		# be running.. We won't do anything here, but


Property changes on: nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-05-29 13:02:01 UTC (rev 923)
+++ nagios2/trunk/debian/rules	2006-05-29 13:27:46 UTC (rev 924)
@@ -165,8 +165,9 @@
 	dh_testdir           -a
 	dh_testroot          -a
 	dh_link		     -a
+	dh_installchangelogs -a
+	dh_installdocs       -a
 	dh_install           -a
-	dh_installdocs       -a
 	dh_strip             -a  --dbg-package=nagios2-dbg
 	dh_compress          -a
 	dh_fixperms          -a -X/var/cache/nagios2