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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-20 00:04:40 +0000 (Tue, 20 Dec 2005)
New Revision: 415

Modified:
   sysvinit/trunk/debian/patches/30_strip.dpatch
   sysvinit/trunk/debian/rules
Log:
Strip in separate step

Modified: sysvinit/trunk/debian/patches/30_strip.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/30_strip.dpatch	2005-12-19 23:28:53 UTC (rev 414)
+++ sysvinit/trunk/debian/patches/30_strip.dpatch	2005-12-20 00:04:40 UTC (rev 415)
@@ -5,40 +5,44 @@
 ## DP: Make sure installed binaries are stripped.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.Norpm1/trunk/src/Makefile
+diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.t3GpMX/trunk/src/Makefile
 --- ./src/Makefile	2005-12-19 22:45:14.000000000 +0100
-+++ /tmp/dpep-work.Norpm1/trunk/src/Makefile	2005-12-20 00:18:16.000000000 +0100
-@@ -46,7 +46,8 @@
++++ /tmp/dpep-work.t3GpMX/trunk/src/Makefile	2005-12-20 01:02:47.000000000 +0100
+@@ -46,7 +46,9 @@
  BIN_OWNER	= root
  BIN_GROUP	= root
  BIN_COMBO	= $(BIN_OWNER):$(BIN_GROUP)
 -INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
-+INSTALL_EXEC	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755 -s
++STRIP		= strip -s
++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
  
  # Additional libs for GNU libc.
-@@ -111,15 +112,15 @@
+@@ -111,15 +113,18 @@
  
  install:
  		for i in $(BIN); do \
 -			$(INSTALL) -m 755 $$i $(ROOT)/bin/; \
-+			$(INSTALL_EXEC) $$i $(ROOT)/bin/; \
++			$(STRIP) $$i ; \
++			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
  		done
  		for i in $(SBIN); do \
 -			$(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
-+			$(INSTALL_EXEC) $$i $(ROOT)/sbin/; \
++			$(STRIP) $$i ; \
++			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
  		done
  		for i in $(USRBIN); do \
 -			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
-+			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/; \
++			$(STRIP) $$i ; \
++			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
  		done
 -		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
 +		# $(INSTALL_EXEC) etc/initscript.sample $(ROOT)/etc/
  		ln -sf halt $(ROOT)/sbin/reboot
  		ln -sf halt $(ROOT)/sbin/poweroff
  		ln -sf init $(ROOT)/sbin/telinit
-@@ -127,15 +128,15 @@
+@@ -127,15 +132,15 @@
  		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
  			ln -sf last $(ROOT)/usr/bin/lastb; \
  		fi

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-12-19 23:28:53 UTC (rev 414)
+++ sysvinit/trunk/debian/rules	2005-12-20 00:04:40 UTC (rev 415)
@@ -136,9 +136,11 @@
 		$(tmp)/usr/share/man/man8/fsck.nfs.8
 	install -g root -m 644 debian/initscripts/rcS.5 \
 		$(tmp)/usr/share/man/man5
-	install -g root -m 755 -s src/mountpoint $(tmp)/bin
+	install -g root -m 755 src/mountpoint $(tmp)/bin
+	strip -s $(tmp)/bin/mountpoint
 	install -g root -m 644 man/mountpoint.1 $(tmp)/usr/share/man/man1
-	install -g root -m 755 -s debian/readlink $(tmp)/lib/init
+	install -g root -m 755 debian/readlink $(tmp)/lib/init
+	strip -s $(tmp)/lib/init/readlink
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
 	install -d -g root -m 755 -o root $(tmp)/usr/share/lintian/overrides
 	install -g root -m 644 -o root \