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

[Petter Reinholdtsen]

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

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 12:53:58 UTC (rev 1495)
+++ sysvinit/trunk/debian/changelog	2009-07-24 12:55:11 UTC (rev 1496)
@@ -7,6 +7,7 @@
     - Update patch 14_doc_fsf_addr to drop the parts now included upstream.
     - Drop patch 15_doc_pidof now included upstream.
     - Drop patch 16_doc_runlevel now included upstream.
+    - Drop patch 17_doc_halt 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 12:53:58 UTC (rev 1495)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 12:55:11 UTC (rev 1496)
@@ -4,7 +4,6 @@
 # 12_doc_lastb patch is reported to be incorrect.
 #12_doc_lastb
 14_doc_fsf_addr
-##17_doc_halt
 ##21_ifdown_kfreebsd
 ##25_last_sanify
 ##26_last_ipv6

Deleted: sysvinit/trunk/debian/patches/17_doc_halt.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/17_doc_halt.dpatch	2009-07-24 12:53:58 UTC (rev 1495)
+++ sysvinit/trunk/debian/patches/17_doc_halt.dpatch	2009-07-24 12:55:11 UTC (rev 1496)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_doc_halt.dpatch by Bill Nottingham and Fedora
-
-Document that the kernel may sync even if reboot is called with -n.
-Fedora changelog claim it solves
-<URL:https://bugzilla.redhat.com/show_bug.cgi?id=180967>, which is
-blocked from public view.
-
- at DPATCH@
---- sysvinit-2.86/man/halt.8.haltman	2001-11-21 16:11:22.000000000 -0500
-+++ sysvinit-2.86/man/halt.8	2006-03-17 12:26:39.000000000 -0500
-@@ -50,7 +50,8 @@
- .\"{{{  Options
- .SH OPTIONS
- .IP \fB\-n\fP
--Don't sync before reboot or halt.
-+Don't sync before reboot or halt. Note that the kernel and storage
-+drivers may still sync.
- .IP \fB\-w\fP
- Don't actually reboot or halt but only write the wtmp record
- (in the \fI/var/log/wtmp\fP file).