[Pkg-sysvinit-commits] r1855 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-22 23:33:45 +0000 (Mon, 22 Mar 2010)
New Revision: 1855

Added:
   sysvinit/trunk/debian/patches/99_nostrip.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
New patch 99_nostrip.patch to remove stripping for src/Makefile to
get nostrip build option working (Closes: #438085).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-22 21:10:18 UTC (rev 1854)
+++ sysvinit/trunk/debian/changelog	2010-03-22 23:33:45 UTC (rev 1855)
@@ -1,3 +1,10 @@
+sysvinit (2.87dsf-11) UNRELEASED; urgency=low
+
+  * New patch 99_nostrip.patch to remove stripping for src/Makefile to
+    get nostrip build option working (Closes: #438085).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 23 Mar 2010 00:32:47 +0100
+
 sysvinit (2.87dsf-10) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Added: sysvinit/trunk/debian/patches/99_nostrip.patch
===================================================================
--- sysvinit/trunk/debian/patches/99_nostrip.patch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/99_nostrip.patch	2010-03-22 23:33:45 UTC (rev 1855)
@@ -0,0 +1,40 @@
+Purpose: Remove strip commands from src/Makefile to make sure nostrip
+         build option work as it should.
+Authour: Petter Reinholdtsen
+Fixes:   #438085
+Status:  Not sent upstream yet
+
+--- a/src/Makefile	(revision 1850)
++++ b/src/Makefile	(working copy)
+@@ -10,7 +10,6 @@
+ 
+ CC	= gcc
+ CFLAGS	= -ansi -W -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+-LDFLAGS	= -s
+ STATIC	=
+ 
+ # For some known distributions we do not build all programs, otherwise we do.
+@@ -46,7 +45,6 @@
+ BIN_OWNER	= root
+ BIN_GROUP	= root
+ BIN_COMBO	= $(BIN_OWNER):$(BIN_GROUP)
+-STRIP		= strip -s -R .comment
+ INSTALL_EXEC	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755
+ INSTALL_DATA	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 644
+ MANDIR		= /usr/share/man
+@@ -128,15 +126,12 @@
+ 
+ install:
+ 		for i in $(BIN); do \
+-			$(STRIP) $$i ; \
+ 			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+ 		done
+ 		for i in $(SBIN); do \
+-			$(STRIP) $$i ; \
+ 			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
+ 		done
+ 		for i in $(USRBIN); do \
+-			$(STRIP) $$i ; \
+ 			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
+ 		done
+ 		# $(INSTALL_EXEC) etc/initscript.sample $(ROOT)/etc/

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2010-03-22 21:10:18 UTC (rev 1854)
+++ sysvinit/trunk/debian/patches/series	2010-03-22 23:33:45 UTC (rev 1855)
@@ -16,3 +16,4 @@
 96_shutdown_acctoff.dpatch
 97_init_starttest.dpatch
 98_installtarget.patch
+99_nostrip.patch