introduce watershed.txt

diff --git a/.gitignore b/.gitignore
index fa3ec36a2a7c2441feda6856b29a030e0a63d8f6..26ff7529d04a9e6570566111d87ae726939150a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ cprogs/xacpi-simple
 cprogs/mcastsoundd
 cprogs/summer
 cprogs/watershed
 cprogs/mcastsoundd
 cprogs/summer
 cprogs/watershed

+cprogs/watershed.txt

 cprogs/rcopy-repeatedly
 
 debian/tmp
 cprogs/rcopy-repeatedly
 
 debian/tmp

diff --git a/cprogs/Makefile b/cprogs/Makefile
index e9f19e01bc7f12caeb9d8a3f4c59be337acc0833..a936e642f60a741c6a2f57220ff40e3ccb6159d7 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -21,6 +21,8 @@
 # with this program; if not, consult the Free Software Foundation's
 # website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # with this program; if not, consult the Free Software Foundation's
 # website at www.fsf.org, or the GNU Project website at www.gnu.org.
 

+us=    chiark-utils-bin
+

 include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 include ../settings.make
 
 RWBUFFER_SIZE_MB=16


@@ -31,8 +33,10 @@ SUIDSBINPROGRAMS=    really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1
 MAN8PAGES=             trivsoundd.8 really.8
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1
 MAN8PAGES=             trivsoundd.8 really.8

+BUILTTXTDOCS=          watershed.txt
+TXTDOCS=               $(BUILTTXTDOCS)

 
 

-TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
+TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)

 
 all:           $(TARGETS)
 
 
 all:           $(TARGETS)
 


@@ -56,6 +60,9 @@ rcopy-repeatedly: rcopy-repeatedly.o myopt.o
 watershed:     watershed.o
                $(CC) -o $@ $< -lnettle -lgmp
 
 watershed:     watershed.o
                $(CC) -o $@ $< -lnettle -lgmp
 

+watershed.txt: watershed.c
+               sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
+

 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)


@@ -63,10 +70,11 @@ install:            all
                $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
                        $(SUIDSBINPROGRAMS) $(sbindir)
 
                $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
                        $(SUIDSBINPROGRAMS) $(sbindir)
 

-install-docs:
+install-docs:  watershed.txt

                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
                $(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
                $(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
                $(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
                $(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.

+               $(INSTALL) -m 644 $(TXTDOCS) ${txtdocdir}/.

 
 install-examples:
 
 
 install-examples:
 

diff --git a/cprogs/watershed.c b/cprogs/watershed.c
index dfc9480b2057be7b9adc8385f5acf8eb492d63ab..3bf9b0763e3b1643e9a1cf20f0b85f08295af817 100644 (file)
--- a/cprogs/watershed.c
+++ b/cprogs/watershed.c
@@ -296,7 +296,8 @@ static int cohort_fd, lock_fd;
 
 static void badusage(void) {
   fputs(_("usage: watershed [<options>] <command>...\n"
 
 static void badusage(void) {
   fputs(_("usage: watershed [<options>] <command>...\n"

-         "options: -d|--state-dir <directory>  -i|--command-id <id>\n"),
+         "options: -d|--state-dir <directory>  -i|--command-id <id>\n"
+         "see /usr/share/doc/chiark-utils-bin/watershed.txt\n"),

          stderr);
   exit(127);
 }
          stderr);
   exit(127);
 }

diff --git a/debian/changelog b/debian/changelog
index 4ed6596d88cbf682a253c65fcab00a5524ebf129..46a4bb8137889c4fec9290595e2ff48cf16eaf78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 chiark-utils (4.1.31~~iwj) unstable; urgency=low
 
 chiark-utils (4.1.31~~iwj) unstable; urgency=low
 

+  * watershed now installs its head doc comment in
+    /usr/share/doc/chiark-utils-bin/watershed.txt.
+    This is apropos of #659989 but is of course not a proper fix.
+

   * chiark-backup Suggests chiark-utils-bin, not the nonexistent
     chiark-cprogs (for `summer').
   * Fix the build-depends to refer to nettle-dev not libnettle-dev.
   * chiark-backup Suggests chiark-utils-bin, not the nonexistent
     chiark-cprogs (for `summer').
   * Fix the build-depends to refer to nettle-dev not libnettle-dev.