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

Thomas Hood jdthood-guest at costa.debian.org
Wed Feb 15 16:15:10 UTC 2006


Author: jdthood-guest
Date: 2006-02-15 16:15:09 +0000 (Wed, 15 Feb 2006)
New Revision: 752

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
Log:
Fix #352741

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-02-13 07:42:55 UTC (rev 751)
+++ sysvinit/trunk/debian/changelog	2006-02-15 16:15:09 UTC (rev 752)
@@ -1,8 +1,9 @@
-sysvinit (2.86.ds1-13~1) unstable; urgency=low
+sysvinit (2.86.ds1-13~2) unstable; urgency=low
 
   [ Thomas Hood ]
   * umountroot: Tweak handling of error messages from mount
     (Closes: #352398)
+  * pidof.8: Don't imply that pidof is in /sbin  (closes: #352741)
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Mon, 13 Feb 2006 08:42:44 +0100
 

Modified: sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/10_doc_manuals.dpatch	2006-02-13 07:42:55 UTC (rev 751)
+++ sysvinit/trunk/debian/patches/10_doc_manuals.dpatch	2006-02-15 16:15:09 UTC (rev 752)
@@ -5,9 +5,9 @@
 ## DP: Misc patches to manual pages
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.2Q89xZ/trunk/man/bootlogd.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.VkakEo/trunk/man/bootlogd.8
 --- ./man/bootlogd.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/bootlogd.8	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/bootlogd.8	2006-02-15 17:10:18.000000000 +0100
 @@ -11,7 +11,7 @@
  .SH DESCRIPTION
  \fBBootlogd\fP runs in the background and copies all strings sent to the
@@ -49,9 +49,9 @@
  .SH AUTHOR
  Miquel van Smoorenburg, miquels at cistron.nl
  .SH "SEE ALSO"
-diff -urNad --exclude=CVS --exclude=.svn ./man/halt.8 /tmp/dpep-work.2Q89xZ/trunk/man/halt.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/halt.8 /tmp/dpep-work.VkakEo/trunk/man/halt.8
 --- ./man/halt.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/halt.8	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/halt.8	2006-02-15 17:10:18.000000000 +0100
 @@ -36,7 +36,7 @@
  .SH DESCRIPTION
  \fBHalt\fP notes that the system is being brought down in the file
@@ -93,9 +93,9 @@
  \fBpoweroff\fP is called or the \fB-h\fP switch will do nothing.
  .PP
  .\"}}}
-diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.2Q89xZ/trunk/man/init.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.VkakEo/trunk/man/init.8
 --- ./man/init.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/init.8	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/init.8	2006-02-15 17:10:18.000000000 +0100
 @@ -36,21 +36,34 @@
  only a selected group of processes to exist.  The processes spawned by
  \fBinit\fP for each of these runlevels are defined in the
@@ -167,9 +167,9 @@
  .\"}}}
  .\"{{{  Diagnostics
  .SH DIAGNOSTICS
-diff -urNad --exclude=CVS --exclude=.svn ./man/initscript.5 /tmp/dpep-work.2Q89xZ/trunk/man/initscript.5
+diff -urNad --exclude=CVS --exclude=.svn ./man/initscript.5 /tmp/dpep-work.VkakEo/trunk/man/initscript.5
 --- ./man/initscript.5	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/initscript.5	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/initscript.5	2006-02-15 17:10:18.000000000 +0100
 @@ -29,9 +29,9 @@
    PATH=/bin:/sbin:/usr/bin:/usr/sbin
    export PATH
@@ -183,9 +183,9 @@
    # with "ulimit -Sn xxx" (needs a 2.2.13 or later Linux kernel).
    ulimit -Hn 8192
  
-diff -urNad --exclude=CVS --exclude=.svn ./man/inittab.5 /tmp/dpep-work.2Q89xZ/trunk/man/inittab.5
+diff -urNad --exclude=CVS --exclude=.svn ./man/inittab.5 /tmp/dpep-work.VkakEo/trunk/man/inittab.5
 --- ./man/inittab.5	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/inittab.5	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/inittab.5	2006-02-15 17:10:18.000000000 +0100
 @@ -128,7 +128,7 @@
  .\"}}}
  .\"{{{  powerokwait
@@ -195,9 +195,9 @@
  power has been restored.
  .\"}}}
  .\"{{{  powerfailnow
-diff -urNad --exclude=CVS --exclude=.svn ./man/last.1 /tmp/dpep-work.2Q89xZ/trunk/man/last.1
+diff -urNad --exclude=CVS --exclude=.svn ./man/last.1 /tmp/dpep-work.VkakEo/trunk/man/last.1
 --- ./man/last.1	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/last.1	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/last.1	2006-02-15 17:10:18.000000000 +0100
 @@ -51,6 +51,8 @@
  .\"}}}
  .\"{{{  Options
@@ -207,9 +207,9 @@
  .IP \fB\-\fP\fInum\fP
  This is a count telling \fBlast\fP how many lines to show.
  .IP "\fB\-n\fP \fInum\fP"
-diff -urNad --exclude=CVS --exclude=.svn ./man/mesg.1 /tmp/dpep-work.2Q89xZ/trunk/man/mesg.1
+diff -urNad --exclude=CVS --exclude=.svn ./man/mesg.1 /tmp/dpep-work.VkakEo/trunk/man/mesg.1
 --- ./man/mesg.1	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/mesg.1	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/mesg.1	2006-02-15 17:10:18.000000000 +0100
 @@ -26,7 +26,9 @@
  .PP
  If no option is given, \fBmesg\fP prints out the current access state of your
@@ -221,10 +221,10 @@
  \fBMesg\fP assumes that its standard input is connected to your
  terminal. That also means that if you are logged in multiple times,
  you can get/set the mesg status of other sessions by using redirection.
-diff -urNad --exclude=CVS --exclude=.svn ./man/pidof.8 /tmp/dpep-work.2Q89xZ/trunk/man/pidof.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/pidof.8 /tmp/dpep-work.VkakEo/trunk/man/pidof.8
 --- ./man/pidof.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/pidof.8	2006-02-01 14:29:09.000000000 +0100
-@@ -31,6 +31,13 @@
++++ /tmp/dpep-work.VkakEo/trunk/man/pidof.8	2006-02-15 17:12:34.000000000 +0100
+@@ -31,9 +31,16 @@
  Tells \fIpidof\fP to omit processes with that process id. The special
  pid \fB%PPID\fP can be used to name the parent process of the \fIpidof\fP
  program, in other words the calling shell or shell script.
@@ -236,11 +236,16 @@
 +.B 1
 +No program was found with the requested name.
  .SH NOTES
- \fIpidof\fP is simply a (symbolic) link to the \fIkillall5\fP program,
- which should also be located in \fP/sbin\fP.
-diff -urNad --exclude=CVS --exclude=.svn ./man/shutdown.8 /tmp/dpep-work.2Q89xZ/trunk/man/shutdown.8
+-\fIpidof\fP is simply a (symbolic) link to the \fIkillall5\fP program,
+-which should also be located in \fP/sbin\fP.
++\fIpidof\fP is actually the same program as \fIkillall5\fP;
++the program behaves according to the name under which it is called.
+ .PP
+ When \fIpidof\fP is invoked with a full pathname to the program it
+ should find the pid of, it is reasonably safe. Otherwise it is possible
+diff -urNad --exclude=CVS --exclude=.svn ./man/shutdown.8 /tmp/dpep-work.VkakEo/trunk/man/shutdown.8
 --- ./man/shutdown.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/shutdown.8	2006-02-01 14:30:15.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/shutdown.8	2006-02-15 17:10:18.000000000 +0100
 @@ -54,7 +54,7 @@
  .\"}}}
  .\"{{{  -h
@@ -280,9 +285,9 @@
  .\"}}}
  .\"{{{  Files
  .SH ACCESS CONTROL
-diff -urNad --exclude=CVS --exclude=.svn ./man/sulogin.8 /tmp/dpep-work.2Q89xZ/trunk/man/sulogin.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/sulogin.8 /tmp/dpep-work.VkakEo/trunk/man/sulogin.8
 --- ./man/sulogin.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.2Q89xZ/trunk/man/sulogin.8	2006-02-01 14:29:09.000000000 +0100
++++ /tmp/dpep-work.VkakEo/trunk/man/sulogin.8	2006-02-15 17:10:18.000000000 +0100
 @@ -1,61 +1,68 @@
 -.TH SULOGIN 8 "04 Nov 2003" "" "Linux System Administrator's Manual"
 +.TH SULOGIN 8 "17 Jan 2006" "" "Linux System Administrator's Manual"




More information about the Pkg-sysvinit-commits mailing list