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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-03-19 16:54:20 +0000 (Sun, 19 Mar 2006)
New Revision: 773

Modified:
   sysvinit/trunk/debian/NOTES
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/patches/52_bootlogd_createlogfile.dpatch
Log:
Add versioned Conflict with older sysvinit because of #357667; mention this in NOTES; include new bootlogd options in the usage message

Modified: sysvinit/trunk/debian/NOTES
===================================================================
--- sysvinit/trunk/debian/NOTES	2006-03-16 19:47:33 UTC (rev 772)
+++ sysvinit/trunk/debian/NOTES	2006-03-19 16:54:20 UTC (rev 773)
@@ -104,6 +104,9 @@
   in /usr/bin, as it was before, including in 2.8.4 in sarge)
 * initscripts Conflicts with and Replaces mdutils which was last seen in
   potato.  Can disappear after etch.
+* initscripts Conflicts with sysvinit (<< 2.86.ds1-12) because earlier
+  versions of bootlogd didn't have the -c option which the bootlogd
+  initscripts now uses
 
 Questionable:
 * initscripts Replaces various libc packages for reasons described here:

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-03-16 19:47:33 UTC (rev 772)
+++ sysvinit/trunk/debian/changelog	2006-03-19 16:54:20 UTC (rev 773)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-14~2) unstable; urgency=low
+sysvinit (2.86.ds1-14~3) unstable; urgency=low
 
   [ Thomas Hood ]
   * umountfs: Unmount in order of decreasing mount point length
@@ -6,6 +6,10 @@
     Thanks to Jiri Polach
   * Don't Build-Depend on selinux stuff on kfreebsd-amd64
     (Closes: #357245)
+  * Make initscripts Conflict with sysvinit (<< 2.86.ds1-12) because
+    bootlogd initscript uses an option that was introduced in
+    2.86.ds1-12
+  * bootlogd: Mention -p and -c options in usage message
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Thu, 16 Mar 2006 19:45:04 +0100
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2006-03-16 19:47:33 UTC (rev 772)
+++ sysvinit/trunk/debian/control	2006-03-19 16:54:20 UTC (rev 773)
@@ -35,7 +35,7 @@
 Package: initscripts
 Architecture: any
 Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, e2fsprogs (>= 1.32+1.33-WIP-2003.04.14-1), debianutils (>= 2.13.1), lsb-base (>= 3.0-6)
-Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2) 
+Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12)
 Replaces: mdutils, sysvinit (<< 2.85-12), libc6, libc6.1, libc0.1, libc0.3
 Description: Scripts for initializing and shutting down the system
  The scripts in this package initialize a standard Debian

Modified: sysvinit/trunk/debian/patches/52_bootlogd_createlogfile.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/52_bootlogd_createlogfile.dpatch	2006-03-16 19:47:33 UTC (rev 772)
+++ sysvinit/trunk/debian/patches/52_bootlogd_createlogfile.dpatch	2006-03-19 16:54:20 UTC (rev 773)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.pguvwr/trunk/man/bootlogd.8
---- ./man/bootlogd.8	2006-01-23 11:38:17.000000000 +0100
-+++ /tmp/dpep-work.pguvwr/trunk/man/bootlogd.8	2006-01-23 11:55:45.000000000 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.PNSf00/trunk/man/bootlogd.8
+--- ./man/bootlogd.8	2006-03-19 17:51:42.000000000 +0100
++++ /tmp/dpep-work.PNSf00/trunk/man/bootlogd.8	2006-03-19 17:51:42.000000000 +0100
 @@ -3,6 +3,7 @@
  bootlogd \- record boot messages
  .SH SYNOPSIS
@@ -29,9 +29,9 @@
  .IP \fB\-r\fP
  If there is an existing logfile called \fIlogfile\fP rename it to
  \fIlogfile~\fP unless \fIlogfile~\fP already exists.
-diff -urNad --exclude=CVS --exclude=.svn ./src/bootlogd.c /tmp/dpep-work.pguvwr/trunk/src/bootlogd.c
---- ./src/bootlogd.c	2006-01-23 11:38:17.000000000 +0100
-+++ /tmp/dpep-work.pguvwr/trunk/src/bootlogd.c	2006-01-23 11:51:12.000000000 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./src/bootlogd.c /tmp/dpep-work.PNSf00/trunk/src/bootlogd.c
+--- ./src/bootlogd.c	2006-03-19 17:51:42.000000000 +0100
++++ /tmp/dpep-work.PNSf00/trunk/src/bootlogd.c	2006-03-19 17:52:39.000000000 +0100
 @@ -56,6 +56,7 @@
  
  int got_signal = 0;
@@ -40,6 +40,15 @@
  int syncalot = 0;
  
  struct line {
+@@ -385,7 +386,7 @@
+  */
+ void usage(void)
+ {
+-	fprintf(stderr, "Usage: bootlogd [-v] [-r] [-d] [-p pidfile] [-l logfile]\n");
++	fprintf(stderr, "Usage: bootlogd [-v] [-r] [-d] [-s] [-c] [-p pidfile] [-l logfile]\n");
+ 	exit(1);
+ }
+ 
 @@ -447,7 +448,7 @@
  	rotate = 0;
  	dontfork = 0;