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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-02-01 13:41:04 +0000 (Wed, 01 Feb 2006)
New Revision: 724

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
Log:
Fix typo  (Closes: #350830)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-02-01 13:31:53 UTC (rev 723)
+++ sysvinit/trunk/debian/changelog	2006-02-01 13:41:04 UTC (rev 724)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-12~8) unstable; urgency=low
+sysvinit (2.86.ds1-12~9) unstable; urgency=low
 
   [ Thomas Hood ]
   * Aim for testing:  Closes: #341075
@@ -27,6 +27,7 @@
   * initscripts postinst: Actually remove some things on purge
   * rcS(5): Improve; mention that if UTC=no then admin must ensure
     that zoneinfo is available
+  * shutdown(8): Fix typo  (Closes: #350830)
   * Add README.Debian for sysv-rc
 
   [ A Costa / TH ]

Modified: sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2006-02-01 13:31:53 UTC (rev 723)
+++ sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2006-02-01 13:41:04 UTC (rev 724)
@@ -7,16 +7,29 @@
 ## DP: #331041.
 
 @DPATCH@
-Index: sysvinit/src/shutdown.c
-===================================================================
---- sysvinit/src/shutdown.c	(revisjon 100)
-+++ sysvinit/src/shutdown.c	(arbeidskopi)
+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 needs -h flag.\n");
++		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
 +		usage();
 +  		exit(1);
 +	}
@@ -24,23 +37,3 @@
  	/* Do we need to use the shutdown.allow file ? */
  	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
  
-Index: sysvinit/man/shutdown.8
-===================================================================
---- sysvinit/man/shutdown.8	(revisjon 100)
-+++ sysvinit/man/shutdown.8	(arbeidskopi)
-@@ -54,12 +54,12 @@
- .\"}}}
- .\"{{{  -h
- .IP \fB\-h\fP
--Halt or poweroff after shutdown.
-+Halt or poweroff after shutdown.  Must be used with the -h flag.
- .\"}}}
- .\"{{{  -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