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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-19 23:20:38 +0000 (Mon, 19 Dec 2005)
New Revision: 412

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/30_strip.dpatch
Log:
Strip harder

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-19 21:54:20 UTC (rev 411)
+++ sysvinit/trunk/debian/changelog	2005-12-19 23:20:38 UTC (rev 412)
@@ -14,6 +14,7 @@
     (Closes: #344001)
   * Add 45_pidof_symlink.dpatch: Make pidof an absolute symlink
     (Closes: #343862)
+  * Edit 30_strip.dpatch: Strip harder
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Sun, 18 Dec 2005 00:00:58 +0100
 

Modified: sysvinit/trunk/debian/patches/30_strip.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/30_strip.dpatch	2005-12-19 21:54:20 UTC (rev 411)
+++ sysvinit/trunk/debian/patches/30_strip.dpatch	2005-12-19 23:20:38 UTC (rev 412)
@@ -5,19 +5,40 @@
 ## DP: Make sure installed binaries are stripped.
 
 @DPATCH@
---- sysvinit-2.86.ds1.orig/src/Makefile
-+++ sysvinit-2.86.ds1/src/Makefile
+diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.Norpm1/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 @@
  BIN_OWNER	= root
  BIN_GROUP	= root
  BIN_COMBO	= $(BIN_OWNER):$(BIN_GROUP)
 -INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
-+INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755 -s
++INSTALL_EXEC	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755 -s
 +INSTALL_DATA	= install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 644
  MANDIR		= /usr/share/man
  
  # Additional libs for GNU libc.
-@@ -127,16 +128,16 @@
+@@ -111,15 +112,15 @@
+ 
+ install:
+ 		for i in $(BIN); do \
+-			$(INSTALL) -m 755 $$i $(ROOT)/bin/; \
++			$(INSTALL_EXEC) $$i $(ROOT)/bin/; \
+ 		done
+ 		for i in $(SBIN); do \
+-			$(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
++			$(INSTALL_EXEC) $$i $(ROOT)/sbin/; \
+ 		done
+ 		for i in $(USRBIN); do \
+-			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
++			$(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 @@
  		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
  			ln -sf last $(ROOT)/usr/bin/lastb; \
  		fi