[Pkg-haskell-commits] darcs: haskell98-report: Fix haskell.idx generation (Closes: #669528)
Joachim Breitner
mail at joachim-breitner.de
Fri Apr 20 19:25:07 UTC 2012
Fri Apr 20 19:23:41 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Fix haskell.idx generation (Closes: #669528)
Ignore-this: 28116f214f3a065d03fe8b8f8d5e792c
M ./changelog +6
M ./patches/correct-build.patch -60 +42
M ./rules +1
Fri Apr 20 19:23:41 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Fix haskell.idx generation (Closes: #669528)
Ignore-this: 28116f214f3a065d03fe8b8f8d5e792c
diff -rN -u old-haskell98-report//changelog new-haskell98-report//changelog
--- old-haskell98-report//changelog 2012-04-20 19:25:06.975247753 +0000
+++ new-haskell98-report//changelog 2012-04-20 19:25:06.995248614 +0000
@@ -1,3 +1,9 @@
+haskell98-report (20080907-4) UNRELEASED; urgency=low
+
+ * Fix haskell.idx generation (Closes: #669528)
+
+ -- Joachim Breitner <nomeata at debian.org> Fri, 20 Apr 2012 19:50:25 +0200
+
haskell98-report (20080907-3) unstable; urgency=low
* GHC 7.4 compatibility (Closes: #665065)
diff -rN -u old-haskell98-report//patches/correct-build.patch new-haskell98-report//patches/correct-build.patch
--- old-haskell98-report//patches/correct-build.patch 2012-04-20 19:25:06.959249192 +0000
+++ new-haskell98-report//patches/correct-build.patch 2012-04-20 19:25:06.987246521 +0000
@@ -1,7 +1,7 @@
Index: haskell98-report-20080907/ffi/Makefile
===================================================================
---- haskell98-report-20080907.orig/ffi/Makefile 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/ffi/Makefile 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/ffi/Makefile 2010-03-08 17:19:06.000000000 +0100
++++ haskell98-report-20080907/ffi/Makefile 2012-04-20 19:52:30.000000000 +0200
@@ -1,9 +1,18 @@
+
+all: ffi.ps ffi.pdf
@@ -29,8 +29,8 @@
+ -rm -f *.aux *.log *.blg *.dvi *.bbl *.toc *.ps *.html *.css *.png *.4ct *.4tc *.idv *.xref tex4ht.fls *.pdf
Index: haskell98-report-20080907/hierarchical-modules/Makefile
===================================================================
---- haskell98-report-20080907.orig/hierarchical-modules/Makefile 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/hierarchical-modules/Makefile 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/hierarchical-modules/Makefile 2010-03-08 17:19:06.000000000 +0100
++++ haskell98-report-20080907/hierarchical-modules/Makefile 2012-04-20 19:52:30.000000000 +0200
@@ -7,5 +7,6 @@
hier.pdf: hier.tex
TEXINPUTS=../styles: pdflatex $<
@@ -42,8 +42,8 @@
+ -rm -f *.aux *.log *.blg *.dvi *.bbl *.toc *.ps *.html *.css *.png *.4ct *.4tc *.idv *.xref tex4ht.fls *.pdf
Index: haskell98-report-20080907/Makefile
===================================================================
---- haskell98-report-20080907.orig/Makefile 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/Makefile 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/Makefile 2010-03-08 17:19:06.000000000 +0100
++++ haskell98-report-20080907/Makefile 2012-04-20 19:52:30.000000000 +0200
@@ -1,14 +1,21 @@
-RELEASE_DIR = haskell98-revised
+PREFIX = haskell98-revised
@@ -74,8 +74,8 @@
-mkdir $(JFP_DIR)
Index: haskell98-report-20080907/report/classes.eps
===================================================================
---- haskell98-report-20080907.orig/report/classes.eps 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/report/classes.eps 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/report/classes.eps 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/report/classes.eps 2012-04-20 19:52:30.000000000 +0200
@@ -826,7 +826,8 @@
%%Trailer
%%DocumentNeededResources:
@@ -88,8 +88,8 @@
%%+ procset Pscript_FatalError 5.0 0
Index: haskell98-report-20080907/report/h98-revised.html
===================================================================
---- haskell98-report-20080907.orig/report/h98-revised.html 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/report/h98-revised.html 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/report/h98-revised.html 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/report/h98-revised.html 2012-04-20 19:52:30.000000000 +0200
@@ -28,13 +28,11 @@
<p><li> The Haskell 98 Report (revised)
<ul>
@@ -106,50 +106,10 @@
<p><li>
<a href="haskell98-bugs.html">A complete list of all changes</a> made to both reports between the Jan 1999 publication
-Index: haskell98-report-20080907/report/haskell.idx
-===================================================================
---- haskell98-report-20080907.orig/report/haskell.idx 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/report/haskell.idx 2012-03-24 22:20:49.000000000 +0100
-@@ -1388,7 +1388,7 @@
- \indexentry{Show@{\tt Show} (class)!instance for {\tt Array}}{178}
- \indexentry{Read@{\tt Read} (class)!instance for {\tt Array}}{178}
- \indexentry{List@{\tt List} (module)}{180}
--\indexentry{\\@{\tt {\char'134}{\char'134}}}{180}
-+\indexentry{\\\\@{\tt {\char'134}{\char'134}}}{180}
- \indexentry{elemIndex@{\tt elemIndex}}{180}
- \indexentry{elemIndices@{\tt elemIndices}}{180}
- \indexentry{find@{\tt find}}{180}
-@@ -1398,7 +1398,7 @@
- \indexentry{nubBy@{\tt nubBy}}{180}
- \indexentry{delete@{\tt delete}}{180}
- \indexentry{deleteBy@{\tt deleteBy}}{180}
--\indexentry{\\@{\tt {\char'134}{\char'134}}}{180}
-+\indexentry{\\\\@{\tt {\char'134}{\char'134}}}{180}
- \indexentry{deleteFirstsBy@{\tt deleteFirstsBy}}{180}
- \indexentry{union@{\tt union}}{180}
- \indexentry{unionBy@{\tt unionBy}}{180}
-@@ -1473,7 +1473,7 @@
- \indexentry{zipWith4@{\tt zipWith4}}{185}
- \indexentry{List@{\tt List} (module)}{186}
- \indexentry{Maybe@{\tt Maybe} (module)}{186}
--\indexentry{\\@{\tt {\char'134}{\char'134}}}{186}
-+\indexentry{\\\\@{\tt {\char'134}{\char'134}}}{186}
- \indexentry{elemIndex@{\tt elemIndex}}{186}
- \indexentry{elemIndices@{\tt elemIndices}}{186}
- \indexentry{find@{\tt find}}{186}
-@@ -1483,7 +1483,7 @@
- \indexentry{nubBy@{\tt nubBy}}{187}
- \indexentry{delete@{\tt delete}}{187}
- \indexentry{deleteBy@{\tt deleteBy}}{187}
--\indexentry{\\@{\tt {\char'134}{\char'134}}}{187}
-+\indexentry{\\\\@{\tt {\char'134}{\char'134}}}{187}
- \indexentry{deleteFirstsBy@{\tt deleteFirstsBy}}{187}
- \indexentry{union@{\tt union}}{187}
- \indexentry{unionBy@{\tt unionBy}}{187}
Index: haskell98-report-20080907/report/Makefile
===================================================================
---- haskell98-report-20080907.orig/report/Makefile 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/report/Makefile 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/report/Makefile 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/report/Makefile 2012-04-20 21:23:18.000000000 +0200
@@ -40,7 +40,11 @@
# Files
#########################################
@@ -172,6 +132,16 @@
-mkdir haskell98-report-html
$(RUN_TEX)
$(RUN_TEX)
+@@ -108,8 +112,8 @@
+
+ haskell.dvi: haskell.tex haskell.ind ${PARTS} $(SYNTAX) ${PRELUDE} ${CODE} ${HEADERS}
+
++haskell.idx: haskell.tex ${PARTS} $(SYNTAX) ${PRELUDE} ${CODE} ${HEADERS}
+
+-# remove this rule if you don't have "makeindex"
+ haskell.ind: haskell.idx
+ $(MAKEINDEX) -i -t haskell.ilg < haskell.idx > haskell.ind
+
@@ -117,8 +121,20 @@
dvips haskell.dvi -o haskell.ps
@@ -204,7 +174,7 @@
publish-pdf: report.pdf
gzip < report.pdf > y:Haskell/haskell98-report/report.pdf.gz
-@@ -140,11 +159,11 @@
+@@ -140,18 +159,19 @@
$(RM) *~
clean:
@@ -217,22 +187,34 @@
+ haskell.tex haskell.ps haskell.pdf *.o lex.yy.c haskell.ind
+ $(RM) -r haskell98-report-html/
+ $(RM) lib-code/*.tex lib-hdrs/*.tex
++ $(RM) haskell.idx
#########################################
-@@ -168,6 +187,8 @@
+ # Suffix rules
+ #########################################
+
+-.SUFFIXES: .hi .hs .verb .tex .dvi
++.SUFFIXES: .hi .hs .verb .tex .dvi .idx
+
+ .verb.tex:
+ $(EXPAND) < $< | $(VERBATIM) | ../tools/subsection >$@
+@@ -168,7 +188,11 @@
.tex.dvi:
$(LATEX) $<
+ $(LATEX) $<
+ $(LATEX) $<
++.tex.idx:
++ $(LATEX) $<
# -----------------------------------------------------------
+ # Out of date stuff
Index: haskell98-report-20080907/tools/Makefile
===================================================================
---- haskell98-report-20080907.orig/tools/Makefile 2012-03-24 22:20:46.000000000 +0100
-+++ haskell98-report-20080907/tools/Makefile 2012-03-24 22:20:52.000000000 +0100
+--- haskell98-report-20080907.orig/tools/Makefile 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/tools/Makefile 2012-04-20 19:52:30.000000000 +0200
@@ -14,13 +14,16 @@
all : verbatim run_tex run_index
@@ -253,8 +235,8 @@
$(GHC) -o run_index index.hs -fglasgow-exts -H20m
Index: haskell98-report-20080907/tools/index.hs
===================================================================
---- haskell98-report-20080907.orig/tools/index.hs 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/tools/index.hs 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/tools/index.hs 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/tools/index.hs 2012-04-20 19:52:30.000000000 +0200
@@ -6,8 +6,8 @@
module Main where
@@ -268,8 +250,8 @@
doFiles refs ["prelude-index"]
Index: haskell98-report-20080907/tools/tex.hs
===================================================================
---- haskell98-report-20080907.orig/tools/tex.hs 2012-03-24 22:20:25.000000000 +0100
-+++ haskell98-report-20080907/tools/tex.hs 2012-03-24 22:20:49.000000000 +0100
+--- haskell98-report-20080907.orig/tools/tex.hs 2010-03-08 17:19:07.000000000 +0100
++++ haskell98-report-20080907/tools/tex.hs 2012-04-20 19:52:30.000000000 +0200
@@ -78,11 +78,11 @@
module Main where
diff -rN -u old-haskell98-report//rules new-haskell98-report//rules
--- old-haskell98-report//rules 2012-04-20 19:25:06.775247201 +0000
+++ new-haskell98-report//rules 2012-04-20 19:25:06.987246521 +0000
@@ -8,6 +8,7 @@
$(MAKE) -C hierarchical-modules
override_dh_auto_clean:
+ rm -rf haskell98-revised
$(MAKE) clean
$(MAKE) -C ffi clean
$(MAKE) -C hierarchical-modules clean
More information about the Pkg-haskell-commits
mailing list