manpage

diff --git a/.gitignore b/.gitignore
index 1d06b3219c1d16f878a27417481924496baa4623..719435fc2d5bbfa94cf030b0bdabdf6a0d156620 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,12 @@
 lout.li
 *.lout.ld
 *.ps
+manpage.pdf
 ps
 t
 t.*
 *.bak
-*.1
+*.[1-9]
 libavg-gitk-cut.ppm
 slides.pdf
 slides.ps

diff --git a/Makefile b/Makefile
index daf0b786acfdddf8fc11d95f496ebaef6228f950..5e8d4c28ac7f3e59c37281b17da3ae07c287b259 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,12 @@ libavg.ps: libavg-gitk-cut.ppm libavg-clone.ppm
 
 manpage.ps: Makefile
        man -Tps dgit >$@.1
-       pstops -pa4 '100:0@1.7L(-4cm,-10cm)' <$@.1 >$@.2
-       sed '/^%%DocumentMedia/d; /^%%BoundingBox/d' <$@.2 | psresize -Pa4 -pa4 >$@.3
-       pstops -w29.7cm -h21cm '100:0@1(0cm,0cm)' <$@.3 $o
-       # 
+       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 $@
+#      ps2ps -sPAPERSIZE=a4 $@.2 $@.3
+#      pstops -w29.7cm -h21cm '100:0@1R(0cm,21cm)' <$@.3 $o
 
 %.ps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1

diff --git a/talk.txt b/talk.txt
index ae076ffd2a789c96290adc2462a27c1807fd6f73..9e37759134d051d8ea0e2045ea8fe5629122b11a 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -3,7 +3,7 @@
 
 [archive as vcs]
 
-The Debian archive is a version control system.
+The Debian archive is (amongst other things) a version control system.
 
   Clone (checkout) <=> apt-get source
   Commit+push <=> upload
@@ -16,11 +16,13 @@ But:
 
 Solution
 
-  Well, we might replace it.  But the archive is various other things
-  besides an appallingly bad VCS.  So instead, let's build something
-  to deal with the problems.
+Well, we might replace it.  But the archive is various other things
+besides an appallingly bad VCS.  And a lot of our co-developers are
+used to it and fear and hate change.  So instead, we should have some
+software to help deal with the problem:
 
-  What that really means is that we need a better gateway.
+What that really means is that we need a better gateway.  That's what
+dgit is.
 
 [manpage]