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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:17:06 +0000 (Fri, 24 Jul 2009)
New Revision: 1505

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:16:15 UTC (rev 1504)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:17:06 UTC (rev 1505)
@@ -17,6 +17,7 @@
     - Drop patch 40_selinux now included upstream.
     - Drop patch 41_utmp_64bit now included upstream.
     - Drop patch 42_utmpdump_retval now included upstream.
+    - Drop patch 45_pidof_symlink now included upstream.
     - Drop patch 60_init_race now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:16:15 UTC (rev 1504)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:17:06 UTC (rev 1505)
@@ -5,7 +5,6 @@
 #12_doc_lastb
 14_doc_fsf_addr
 21_ifdown_kfreebsd
-##45_pidof_symlink
 ##46_pidof_symlinkman
 ##47_pidof_chroot
 ##50_bootlogd_exitcode

Deleted: sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch	2009-07-24 13:16:15 UTC (rev 1504)
+++ sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch	2009-07-24 13:17:06 UTC (rev 1505)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_pidof_symlink.dpatch by Thomas Hood
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make pidof an absolute symlink
-
- at DPATCH@
-diff -urNad trunk~/src/Makefile trunk/src/Makefile
---- trunk~/src/Makefile	2008-03-26 09:33:56.000000000 +0100
-+++ trunk/src/Makefile	2008-03-26 09:33:56.000000000 +0100
-@@ -143,7 +143,7 @@
- 		ln -sf halt $(ROOT)/sbin/reboot
- 		ln -sf halt $(ROOT)/sbin/poweroff
- 		ln -sf init $(ROOT)/sbin/telinit
--		ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
-+		ln -sf /sbin/killall5 $(ROOT)/bin/pidof
- 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- 			ln -sf last $(ROOT)/usr/bin/lastb; \
- 		fi