From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Jun 2012 00:45:28 +0000 (+0100)
Subject: introduce watershed.txt
X-Git-Tag: debian/4.1.31~19^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=773df8155d824fb6387137ff0b8a1f6b81a300de

introduce watershed.txt
---

diff --git a/.gitignore b/.gitignore
index fa3ec36..26ff752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ cprogs/xacpi-simple
 cprogs/mcastsoundd
 cprogs/summer
 cprogs/watershed
+cprogs/watershed.txt
 cprogs/rcopy-repeatedly
 
 debian/tmp
diff --git a/cprogs/Makefile b/cprogs/Makefile
index e9f19e0..a936e64 100644
--- 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.
 
+us=	chiark-utils-bin
+
 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
+BUILTTXTDOCS=		watershed.txt
+TXTDOCS=		$(BUILTTXTDOCS)
 
-TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
+TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)
 
 all:		$(TARGETS)
 
@@ -56,6 +60,9 @@ rcopy-repeatedly: rcopy-repeatedly.o myopt.o
 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)
@@ -63,10 +70,11 @@ install:		all
 		$(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) -m 644 $(TXTDOCS) ${txtdocdir}/.
 
 install-examples:
 
diff --git a/cprogs/watershed.c b/cprogs/watershed.c
index dfc9480..3bf9b07 100644
--- 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"
-	  "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);
 }
diff --git a/debian/changelog b/debian/changelog
index 4ed6596..46a4bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 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.