Debian Codegraph @

debian/patches/patch2

raw
1 Description: reconfiguration and fixes toward bullseye
2 * Observed that, as of upstream version 0.57.20190831, the book's
3 source has been updated to build using modern, standard tools
4 like PDFLaTeX and Hyperref; and, consequently, that upstream
5 has retired and deleted btool/, removing the file PDF.cc and thus
6 obviating (as of the present upload to sid) Lucas Nussbaum's
7 Sept. 2020 bug report (closes: #971095). Thanked Lucas for the
8 timely, helpful report.
9 * Reconfigured and rebuilt for upload to Debian sid.
10 * Conformed to Standards-Version 4.5.1.
11 * Specified the binary to be Multi-Arch: all.
12 * Temporarily worked around new, perhaps buggy behavior by TeX Live.
13 (In the new TeX Live, Pst-pdf seems to interact badly with
14 Hyperref. The present workaround works for now but provokes Ps2pdf
15 to complain of deprecated usage; so before the Derivations package
16 can implement a permanent solution, the future manner in
17 which TeX Live addresses the apparent bug shall have to
18 be observed.)
19 * In tex/Makefile, added a missing, apparently optional = sign to an
20 invocation of latex(1) and fixed the definition of the $(ch)
21 variable. (These changes will be sent upstream.)
22 * Updated tex/README. (This change too will be sent upstream.)
23 Author: Thaddeus H. Black <[email protected]>
24 Bug-Debian: https://bugs.debian.org/971095
25 Last-Update: 2021-01-19
26
27 --- derivations-0.57.20210107.orig/tex/Makefile
28 +++ derivations-0.57.20210107/tex/Makefile
29 @@ -92,9 +92,27 @@ dobd := dobuilddraft
30 dobd0 := dobd0.tex
31 # Possibly confusingly, the "0" in "dobd0" means
32 # roughly the opposite of the "0" in "main0".
33 +#
34 +# The several lines in this file that mention "dobp*"
35 +# and/or "dobuildpstonly" were added or (in the case of the file's
36 +# rules) changed as a workaround toward Debian 11 bullseye, for Debian
37 +# sid's recent Pst-pdf had been interacting badly with Hyperref (the
38 +# bad interaction seemingly having been inadvertently introduced
39 +# by TeX Live upstream). The "dobp*" and "dobuildpstonly" lines
40 +# temporarily shunt Hyperref aside while Pst-pdf acts. Besides the
41 +# foregoing, the -dALLOWPSTRANSPARENCY option was added to the ps2pdf
42 +# invocation (ps2pdf complains of deprecated behavior when this is
43 +# done, so one expects this part of the workaround, at least, to fail
44 +# for some future version of ps2pdf unless the other relevant tools are
45 +# updated). Whether part or all of the workaround is to be retained
46 +# and/or integrated after bullseye's release has not, at this Jan. 2021
47 +# writing, been decided: the workaroud has been little tested except
48 +# for purpose of building the Debian package.
49 +dobp := dobuildpstonly
50 +dobp0 := dobp0.tex
51
52 clsdir := /usr/share/texlive/texmf-dist/tex/latex/base
53 -dobd-null := /dev/null
54 +dob-null := /dev/null
55
56 # Earlier versions of the book directly invoked GhostScript at PDF
57 # level at 1.4. Current versions let tools or TEX source set the
58 @@ -143,11 +161,12 @@ main := $(main0).tex
59 cls0 := $(class).cls
60 cls := $(out)-$(cls0)
61 dobd1 := $(dobd).tex
62 -ch := $(\
63 - filter-out $(main) $(def) \
64 - $(wildcard $(tmpl0)-*.tex), \
65 - $(wildcard *.tex)\
66 - )
67 +dobp1 := $(dobp).tex
68 +ch := $(filter-out \
69 + $(main) $(def) $(wildcard $(tmpl0)-*.tex) \
70 + $(dobd0) $(dobd1) $(dobp0) $(dobp1), \
71 + $(wildcard *.tex)\
72 + )
73 bibtex := bibtex $(main0).aux
74 makeindex := makeindex $(main0).idx
75 exists-dobd := [ -h "$(dobd1)" -a -e "$(dobd1)" ]
76 @@ -158,14 +177,17 @@ pdflatex = pdflatex -shell-restricte
77 .PHONY: all FORCE clean-for-pdf clean-for-dvi cleanless2 cleanless clean
78 all : $(out).pdf
79
80 -$(out).pdf : $(main) $(def) $(cls) $(ch) $(bib) | clean-for-pdf
81 - rm -fv $(dobd1) && ln -sv $(dobd-null) $(dobd1)
82 +$(out).pdf : $(main) $(def) $(cls) $(ch) $(bib) $(dobp0) | clean-for-pdf
83 + rm -fv $(dobd1) && ln -sv $(dob-null) $(dobd1)
84 + rm -fv $(dobp1) && ln -sv $(dob-null) $(dobp1)
85 $(pdflatex)
86 $(bibtex)
87 + rm -fv $(dobp1) && ln -sv $(dobp0) $(dobp1)
88 @# Do not invoke $(latex) here but issue the command directly.
89 - latex -jobname $(main0)-$(pics) $<
90 + latex -jobname=$(main0)-$(pics) $<
91 + rm -fv $(dobp1) && ln -sv $(dob-null) $(dobp1)
92 dvips -o $(main0)-$(pics).ps $(main0)-$(pics).dvi
93 - ps2pdf $(main0)-$(pics).ps
94 + ps2pdf -dALLOWPSTRANSPARENCY $(main0)-$(pics).ps
95 $(pdflatex)
96 $(makeindex)
97 $(pdflatex)
98 @@ -178,8 +200,9 @@ $(out).pdf : $(main) $(def) $(cls) $(c
99 # quick PS draft serves the purpose.)
100 $(out).ps : $(main0).dvi
101 dvips -t letter -o $@ $<
102 -$(main0).dvi : $(main) $(def) $(cls) $(ch) $(dobd0) | clean-for-dvi
103 +$(main0).dvi : $(main) $(def) $(cls) $(ch) $(dobd0) $(dobp0) | clean-for-dvi
104 rm -fv $(dobd1) && ln -sv $(dobd0) $(dobd1)
105 + rm -fv $(dobp1) && ln -sv $(dobp0) $(dobp1)
106 $(latex)
107 $(latex)
108
109 @@ -214,7 +237,7 @@ $(cls) :
110 # cleanless" removes the various intermediate TeX working files, but
111 # leaves intact the final output document files.
112 clean-for-pdf :
113 - if $(exists-dobd) && [ "$(dobd-target)" != "$(dobd-null)" ]; then \
114 + if $(exists-dobd) && [ "$(dobd-target)" != "$(dob-null)" ]; then \
115 $(MAKE) cleanless2; \
116 fi
117 clean-for-dvi :
118 @@ -225,7 +248,7 @@ cleanless2 :
119 rm -fv *.{aux,bbl,blg,idx,ilg,ind,log,lof,lot,toc,pgn,out,bak} \
120 *-$(pics).{dvi,ps,pdf}
121 cleanless : cleanless2
122 - rm -fv *.{cls,dvi} $(dobd1)
123 + rm -fv *.{cls,dvi} $(dobd1) $(dobp1)
124 clean : cleanless
125 rm -fv *.{ps,pdf}
126
127 --- derivations-0.57.20210107.orig/tex/README
128 +++ derivations-0.57.20210107/tex/README
129 @@ -1,8 +1,8 @@
130
131 This directory contains the LaTeX and BibTeX source
132 -files for the book. In addition to TeX, LaTeX, BibTeX,
133 -AMSmath and PSTricks, you also need Rubber installed to
134 -build the source with the default Makefile.
135 +files for the book. To build the book also needs TeX,
136 +LaTeX, PDFLaTeX, BibTeX, AMSmath and PSTricks,
137 +among others.
138
139 NOTES
140
141 --- /dev/null
142 +++ derivations-0.57.20210107/tex/dobp0.tex
143 @@ -0,0 +1 @@
144 +\setboolean{dobuildpstonly}{true}
145 --- derivations-0.57.20210107.orig/tex/main.tex
146 +++ derivations-0.57.20210107/tex/main.tex
147 @@ -4,6 +4,7 @@
148 \documentclass[11pt,twoside,openright,letterpaper]{derivations-book}
149 \usepackage{thb}
150 \newboolean{dobuilddraft}\setboolean{dobuilddraft}{false}\include{dobuilddraft}
151 +\newboolean{dobuildpstonly}\setboolean{dobuildpstonly}{false}\include{dobuildpstonly}
152 \ifthenelse{\boolean{dobuilddraft}}{}{\usepackage{pst-pdf}}
153 \newboolean{isearlyflexedition}
154 \setboolean{isearlyflexedition}{true}
155 @@ -19,12 +20,12 @@
156 \ifthenelse{\boolean{dobuilddraft}}{}{\makeindex}
157
158 %\includeonly{vector}
159 -\ifthenelse{\boolean{dobuilddraft}}{}{
160 +\ifthenelse{\boolean{dobuilddraft}}{}{\ifthenelse{\boolean{dobuildpstonly}}{}{
161 % This package asks to be loaded last. Observe that the value
162 % of pdftitle is a PDF rather than a TEX entity, so it gets
163 % no TEX markup.
164 \usepackage[hidelinks,pdftitle={Thaddeus H. Black}]{hyperref}
165 -}
166 +}}
167 \begin{document}
168 \newwrite\locallog
169 \immediate\openout\locallog=\jobname.pgn