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

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-23 06:02:23 +0000 (Fri, 23 Apr 2010)
New Revision: 1867

Removed:
   sysvinit/trunk/debian/patches/99_nostrip.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
New upstream do not strip binaries, allowing the nostrip
build option to work (Closes: #438085).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-23 05:57:17 UTC (rev 1866)
+++ sysvinit/trunk/debian/changelog	2010-04-23 06:02:23 UTC (rev 1867)
@@ -6,8 +6,8 @@
     - Drop 15_doc_upstream_email.dpatch, now included upstream.
     - Drop 50_bootlogd_devsubdir.dpatch, now included upstream.
     - Drop 94_fstab-decode.dpatch, now included upstream.
-  * New patch 99_nostrip.patch to remove stripping from src/Makefile to
-    get nostrip build option working (Closes: #438085).
+    - New upstream do not strip binaries, allowing the nostrip
+      build option to work (Closes: #438085).
   * Update Standards-Version from 3.8.3 to 3.8.4.  No change needed.
   * Update homepage in control file to the new home
     http://savannah.nongnu.org/projects/sysvinit .

Deleted: sysvinit/trunk/debian/patches/99_nostrip.patch
===================================================================
--- sysvinit/trunk/debian/patches/99_nostrip.patch	2010-04-23 05:57:17 UTC (rev 1866)
+++ sysvinit/trunk/debian/patches/99_nostrip.patch	2010-04-23 06:02:23 UTC (rev 1867)
@@ -1,40 +0,0 @@
-Purpose: Remove strip commands from src/Makefile to make sure nostrip
-         build option work as it should.
-Authour: Petter Reinholdtsen
-Fixes:   #438085
-Status:  Applied upstream
-
---- 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-04-23 05:57:17 UTC (rev 1866)
+++ sysvinit/trunk/debian/patches/series	2010-04-23 06:02:23 UTC (rev 1867)
@@ -11,4 +11,3 @@
 96_shutdown_acctoff.dpatch
 97_init_starttest.dpatch
 98_installtarget.patch
-99_nostrip.patch