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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 14:14:22 +0000 (Fri, 24 Jul 2009)
New Revision: 1527

Removed:
   sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
- Drop patch 90_shutdown_H now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 14:13:45 UTC (rev 1526)
+++ sysvinit/trunk/debian/changelog	2009-07-24 14:14:22 UTC (rev 1527)
@@ -45,6 +45,7 @@
 
   * XXX Need to remove debian patches now included in the new upstream release.
   * - Drop patch 84_killall_fuse now included upstream.
+  * - Drop patch 90_shutdown_H now included upstream.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 24 Jul 2009 11:26:26 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 14:13:45 UTC (rev 1526)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 14:14:22 UTC (rev 1527)
@@ -9,7 +9,6 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##90_shutdown_H
 ##91_sulogin_lockedpw
 ##92_sata-hddown
 ##93_sulogin_fallback

Deleted: sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2009-07-24 14:13:45 UTC (rev 1526)
+++ sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2009-07-24 14:14:22 UTC (rev 1527)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_shutdown_H.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure shutdown flags -H and -P are only given with -h flag,
-## DP: and document this requirement in the manual page.  Fixes bug
-## DP: #331041.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/shutdown.8 /tmp/dpep-work.apEvIZ/trunk/man/shutdown.8
---- ./man/shutdown.8	2006-02-01 14:32:46.000000000 +0100
-+++ /tmp/dpep-work.apEvIZ/trunk/man/shutdown.8	2006-02-01 14:36:39.000000000 +0100
-@@ -58,8 +58,8 @@
- .\"}}}
- .\"{{{  -H
- .IP \fB\-H\fP
--Halt action is to halt or drop into boot monitor on systems that
--support it.
-+Modifier to the -h flag.  Halt action is to halt or drop into boot
-+monitor on systems that support it.  Must be used with the -h flag.
- .\"}}}
- .\"{{{  -P
- .IP \fB\-P\fP
-diff -urNad --exclude=CVS --exclude=.svn ./src/shutdown.c /tmp/dpep-work.apEvIZ/trunk/src/shutdown.c
---- ./src/shutdown.c	2005-12-02 17:22:57.000000000 +0100
-+++ /tmp/dpep-work.apEvIZ/trunk/src/shutdown.c	2006-02-01 14:32:49.000000000 +0100
-@@ -521,6 +521,12 @@
-   		}
- 	}
- 
-+	if (NULL != halttype && down_level[0] != '0') {
-+		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
-+		usage();
-+  		exit(1);
-+	}
-+
- 	/* Do we need to use the shutdown.allow file ? */
- 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
-