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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:12:11 +0000 (Fri, 24 Jul 2009)
New Revision: 1502

Removed:
   sysvinit/trunk/debian/patches/30_strip.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Drop patch 30_strip now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:05:31 UTC (rev 1501)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:12:11 UTC (rev 1502)
@@ -12,6 +12,7 @@
     - Drop patch 26_last_ipv6 now included upstream.
     - Drop patch 27_last_usageopts now included upstream.
     - Drop patch 28_last_full-time now included upstream.
+    - Drop patch 30_strip now included upstream.
     - Drop patch 41_utmp_64bit now included upstream.
     - Drop patch 42_utmpdump_retval now included upstream.
     - Drop patch 60_init_race now included upstream.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:05:31 UTC (rev 1501)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:12:11 UTC (rev 1502)
@@ -5,7 +5,6 @@
 #12_doc_lastb
 14_doc_fsf_addr
 21_ifdown_kfreebsd
-##30_strip
 ##31_build_warnings
 ##40_selinux
 ##45_pidof_symlink

Deleted: sysvinit/trunk/debian/patches/30_strip.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/30_strip.dpatch	2009-07-24 13:05:31 UTC (rev 1501)
+++ sysvinit/trunk/debian/patches/30_strip.dpatch	2009-07-24 13:12:11 UTC (rev 1502)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_strip.dpatch by Petter Reinholdtsten
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure installed binaries are stripped.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.wBpMdg/trunk/src/Makefile
---- ./src/Makefile	2005-12-19 22:45:14.000000000 +0100
-+++ /tmp/dpep-work.wBpMdg/trunk/src/Makefile	2005-12-20 01:07:14.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)
-+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
- 
- # Additional libs for GNU libc.
-@@ -111,15 +113,18 @@
- 
- install:
- 		for i in $(BIN); do \
--			$(INSTALL) -m 755 $$i $(ROOT)/bin/; \
-+			$(STRIP) $$i ; \
-+			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
- 		done
- 		for i in $(SBIN); do \
--			$(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
-+			$(STRIP) $$i ; \
-+			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
- 		done
- 		for i in $(USRBIN); do \
--			$(INSTALL) -m 755 $$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 +132,15 @@
- 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- 			ln -sf last $(ROOT)/usr/bin/lastb; \
- 		fi
--		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
-+		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
- 		for i in $(MAN1); do \
--			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
-+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
- 		done
- 		for i in $(MAN5); do \
--			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/; \
-+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \
- 		done
- 		for i in $(MAN8); do \
--			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
-+			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \
- 		done
- ifeq ($(ROOT),)
- 		#