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

[Marc Haber]

Author: zugschlus
Date: 2006-06-01 17:14:06 +0000 (Thu, 01 Jun 2006)
New Revision: 945

Removed:
   nagios2/trunk/debian/patches/10no-strip.dpatch
   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:
  * new upstream version. (mh) Closes: #369801
  * now use install-unstripped target instead of 10no-strip patch.
  * remove 20-handle-master-proc-event patch, fixed upstream.



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-05-30 09:32:34 UTC (rev 944)
+++ nagios2/trunk/debian/changelog	2006-06-01 17:14:06 UTC (rev 945)
@@ -1,8 +1,11 @@
-nagios2 (2.3.1-1.0) UNRELEASED; urgency=low
+nagios2 (2.4-0) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * new upstream version. (mh) Closes: #369801
+  * now use install-unstripped target instead of 10no-strip patch.
+  * remove 20-handle-master-proc-event patch, fixed upstream.
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Tue, 30 May 2006 09:32:21 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Thu,  1 Jun 2006 17:08:55 +0000
 
 nagios2 (2.3.1-1) unstable; urgency=low
 

Modified: nagios2/trunk/debian/patches/00list
===================================================================
--- nagios2/trunk/debian/patches/00list	2006-05-30 09:32:34 UTC (rev 944)
+++ nagios2/trunk/debian/patches/00list	2006-06-01 17:14:06 UTC (rev 945)
@@ -1,2 +0,0 @@
-10no-strip
-20-handle-master-proc-event

Deleted: nagios2/trunk/debian/patches/10no-strip.dpatch
===================================================================
--- nagios2/trunk/debian/patches/10no-strip.dpatch	2006-05-30 09:32:34 UTC (rev 944)
+++ nagios2/trunk/debian/patches/10no-strip.dpatch	2006-06-01 17:14:06 UTC (rev 945)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10no-strip.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~/base/Makefile.in trunk/base/Makefile.in
---- trunk~/base/Makefile.in	2005-11-26 07:05:35.000000000 +0000
-+++ trunk/base/Makefile.in	2006-05-29 12:37:36.000000000 +0000
-@@ -183,8 +183,6 @@
- install:
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
--	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
--	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
- 
- 
-diff -urNad trunk~/cgi/Makefile.in trunk/cgi/Makefile.in
---- trunk~/cgi/Makefile.in	2005-11-26 07:05:35.000000000 +0000
-+++ trunk/cgi/Makefile.in	2006-05-29 12:37:30.000000000 +0000
-@@ -194,7 +194,6 @@
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
- 	for file in *.cgi; do \
- 		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
--		$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
- 	done
- 
- 

Deleted: nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch
===================================================================
--- nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch	2006-05-30 09:32:34 UTC (rev 944)
+++ nagios2/trunk/debian/patches/20-handle-master-proc-event.dpatch	2006-06-01 17:14:06 UTC (rev 945)
@@ -1,20 +0,0 @@
-#! /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

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-05-30 09:32:34 UTC (rev 944)
+++ nagios2/trunk/debian/rules	2006-06-01 17:14:06 UTC (rev 945)
@@ -130,7 +130,7 @@
 	dh_testroot -a
 	dh_installdirs -a -i
 	# zero out INSTALL_OPTS to prevent chowning at build-time
-	make install DESTDIR=$b/nagios2 INSTALL_OPTS=""
+	make install-unstripped DESTDIR=$b/nagios2 INSTALL_OPTS=""
 	# move some arch-indep stuff to the other packages
 	cp -a $b/nagios2/usr/share/nagios2/htdocs ${bnd}/usr/share/nagios2/
 	rm -rf $b/nagios2/usr/share/nagios2