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

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-23 20:31:23 +0000 (Fri, 23 Apr 2010)
New Revision: 1872

Removed:
   sysvinit/trunk/debian/patches/97_init_starttest.dpatch
   sysvinit/trunk/debian/patches/98_installtarget.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
  - Drop 97_init_starttest.dpatch, now included upstream.
  - Drop 98_installtarget.dpatch, now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-23 20:28:01 UTC (rev 1871)
+++ sysvinit/trunk/debian/changelog	2010-04-23 20:31:23 UTC (rev 1872)
@@ -11,6 +11,8 @@
     - Drop 62_init_freebsdterm.dpatch, now included upstream.
     - Drop 70_compiler_warnings.dpatch, now included upstream.
     - Drop 94_fstab-decode.dpatch, now included upstream.
+    - Drop 97_init_starttest.dpatch, now included upstream.
+    - Drop 98_installtarget.dpatch, now included upstream.
     - Update 63_init_keep_utf8_ttyflag.patch.
     - New upstream do not strip binaries, allowing the nostrip
       build option to work (Closes: #438085).

Deleted: sysvinit/trunk/debian/patches/97_init_starttest.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/97_init_starttest.dpatch	2010-04-23 20:28:01 UTC (rev 1871)
+++ sysvinit/trunk/debian/patches/97_init_starttest.dpatch	2010-04-23 20:31:23 UTC (rev 1872)
@@ -1,20 +0,0 @@
-Purpose: Patch problem reported at 2003-03-10 on
-         <URL:http://freshmeat.net/projects/sysvinit/>.
-Authour: Petter Reinholdtsen
-Fixes:   -
-Status:  Applied upstream.
-
---- a/src/init.c
-+++ b/src/init.c
-@@ -2645,9 +2645,10 @@
- 	 */
- 	isinit = (getpid() == 1);
- 	for (f = 1; f < argc; f++) {
--		if (!strcmp(argv[f], "-i") || !strcmp(argv[f], "--init"))
-+		if (!strcmp(argv[f], "-i") || !strcmp(argv[f], "--init")) {
- 			isinit = 1;
- 			break;
-+		}
- 	}
- 	if (!isinit) exit(telinit(p, argc, argv));
- 

Deleted: sysvinit/trunk/debian/patches/98_installtarget.patch
===================================================================
--- sysvinit/trunk/debian/patches/98_installtarget.patch	2010-04-23 20:28:01 UTC (rev 1871)
+++ sysvinit/trunk/debian/patches/98_installtarget.patch	2010-04-23 20:31:23 UTC (rev 1872)
@@ -1,28 +0,0 @@
-Purpose: Make sure required directories exist before installing into them.
-Authour: Petter Reinholdtsen
-Fixes:   -
-Status:  Applied upstream.
-
---- a/src/Makefile	(revision 1717)
-+++ a/src/Makefile	(working copy)
-@@ -127,6 +127,8 @@
- distclean:	clobber
- 
- install:
-+		$(INSTALL_EXEC) -d $(ROOT)/bin/ $(ROOT)/sbin/
-+		$(INSTALL_EXEC) -d $(ROOT)/usr/bin/
- 		for i in $(BIN); do \
- 			$(STRIP) $$i ; \
- 			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
-@@ -147,7 +149,11 @@
- 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- 			ln -sf last $(ROOT)/usr/bin/lastb; \
- 		fi
-+		$(INSTALL_EXEC) -d $(ROOT)/usr/include/
- 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
-+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man1/
-+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man5/
-+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man8/
- 		for i in $(MAN1); do \
- 			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
- 		done

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2010-04-23 20:28:01 UTC (rev 1871)
+++ sysvinit/trunk/debian/patches/series	2010-04-23 20:31:23 UTC (rev 1872)
@@ -4,5 +4,3 @@
 63_init_keep_utf8_ttyflag.patch
 91_sulogin_lockedpw.dpatch
 96_shutdown_acctoff.dpatch
-97_init_starttest.dpatch
-98_installtarget.patch