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

[Marc Haber]

Author: zugschlus
Date: 2006-05-29 12:52:19 +0000 (Mon, 29 May 2006)
New Revision: 920

Added:
   nagios2/trunk/debian/patches/10no-strip.dpatch
Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/control
   nagios2/trunk/debian/patches/00list
Log:
    * Add 10no-strip patch to keep upstream Makefiles from stripping
      binaries before we can build the -dbg package.



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-05-29 10:44:57 UTC (rev 919)
+++ nagios2/trunk/debian/changelog	2006-05-29 12:52:19 UTC (rev 920)
@@ -5,6 +5,8 @@
   * CVE-2006-2489 was already fixed locally in 2.3-1
     * remove dpatch
   * Add nagios2-dbg package
+    * Add 10no-strip patch to keep upstream Makefiles from stripping
+      binaries before we can build the -dbg package.
   * Fix typos in debian/control
 
   [sean finney]
@@ -17,7 +19,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>  Tue, 23 May 2006 14:58:11 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 29 May 2006 12:51:44 +0000
 
 nagios2 (2.3-1) unstable; urgency=high
 

Modified: nagios2/trunk/debian/control
===================================================================
--- nagios2/trunk/debian/control	2006-05-29 10:44:57 UTC (rev 919)
+++ nagios2/trunk/debian/control	2006-05-29 12:52:19 UTC (rev 920)
@@ -97,7 +97,7 @@
 
 Package: nagios2-dbg
 Section: devel
-Architecture: all
+Architecture: any
 Depends: nagios2 (= ${Source-Version})
 Description: debugging symbols for nagios2
  Nagios is a monitoring and management system for hosts, services and

Modified: nagios2/trunk/debian/patches/00list
===================================================================
--- nagios2/trunk/debian/patches/00list	2006-05-29 10:44:57 UTC (rev 919)
+++ nagios2/trunk/debian/patches/00list	2006-05-29 12:52:19 UTC (rev 920)
@@ -0,0 +1 @@
+10no-strip

Added: nagios2/trunk/debian/patches/10no-strip.dpatch
===================================================================
--- nagios2/trunk/debian/patches/10no-strip.dpatch	2006-05-29 10:44:57 UTC (rev 919)
+++ nagios2/trunk/debian/patches/10no-strip.dpatch	2006-05-29 12:52:19 UTC (rev 920)
@@ -0,0 +1,30 @@
+#! /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
+ 
+ 


Property changes on: nagios2/trunk/debian/patches/10no-strip.dpatch
___________________________________________________________________
Name: svn:executable
   + *