From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 13 Aug 2015 16:35:02 +0000 (+0100)
Subject: manpage-clean.ps etc.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=f8b11ee523d6d4b1f10a5d56d7675325022aff0a;p=talk-2015-debconf-dgit.git

manpage-clean.ps etc.
---

diff --git a/.gitignore b/.gitignore
index 2e080db..d3ae92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ future.ps
 *.1
 manpage.ps
 manpage.ps.?
+manpage-clean.ps
+manpage-clean.ps.?
diff --git a/Makefile b/Makefile
index 71f644e..d95cbd0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ SLIDES+= data-flow
 SLIDES+= dflow-equal
 SLIDES+= data-flow
 SLIDES+= dflow-equal
+SLIDES+= manpage
+SLIDES+= manpage-clean
 SLIDES+= future
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
@@ -32,8 +34,18 @@ manpage.ps: dgit.1-manpage Makefile
 	pstops -pa3 '100:0@1.7(-4cm,-47cm)' <$@.1 >$@.2
 	ps2pdf -sPAPERSIZE=a3 $@.2 $@.3
 	pdfcrop --bbox '0 0 841 595' $@.3 $@.4
-	pdf2ps $@.4 $@.5
-	pstops -pa4 '0L(21cm,0cm)' <$@.5 >$@
+	pdf2ps $@.3 $@.4
+	pstops -pa3 '0L(21cm,0cm)' <$@.4 >$@.5
+	pstops -pa4 '0(0cm,0cm)' <$@.5 >$@
+
+manpage-clean.ps: dgit.1-manpage Makefile
+	man -Tps -l $< >$@.1
+	pstops -pa3 '100:3@1.7(-4cm,-43cm)' <$@.1 >$@.2
+	ps2pdf -sPAPERSIZE=a3 $@.2 $@.3
+	pdfcrop --bbox '0 0 841 595' $@.3 $@.4
+	pdf2ps $@.3 $@.4
+	pstops -pa3 '0L(21cm,0cm)' <$@.4 >$@.5
+	pstops -pa4 '0(0cm,0cm)' <$@.5 >$@
 
 nmu-compare.ps: my-history-inc.eps
 
diff --git a/dgit.1-manpage b/dgit.1-manpage
index 88e9812..f15ec35 100644
--- a/dgit.1-manpage
+++ b/dgit.1-manpage
@@ -242,6 +242,20 @@ Prints version information and exits.
 Tries to fetch a copy of the source code for the dgit-repos-server,
 as actually being used on the dgit git server, as a git tree.
 .SH OPTIONS
+
+xxx
+.TP
+.BR --dry-run " | " -n
+Go through the motions, fetching all information needed, but do not
+actually update the output(s).  For push, dgit does
+the required checks and leaves the new .dsc in a temporary file,
+but does not sign, tag, push or upload.
+.TP
+.BR --dry-run " | " -n
+Go through the motions, fetching all information needed, but do not
+actually update the output(s).  For push, dgit does
+the required checks and leaves the new .dsc in a temporary file,
+but does not sign, tag, push or upload.
 .TP
 .BR --dry-run " | " -n
 Go through the motions, fetching all information needed, but do not
@@ -253,6 +267,7 @@ but does not sign, tag, push or upload.
 Go through many more of the motions: do everything that doesn't
 involve either signing things, or making changes on the public
 servers.
+
 .TP
 .BI -k keyid
 Use