[giac] 01/02: Still run hevea in icas, upstream prefers it that way
Ximin Luo
infinity0 at debian.org
Wed Feb 15 19:17:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository giac.
commit 9801d8e97a1e8d4663448c613785c09580a93f05
Author: Ximin Luo <infinity0 at debian.org>
Date: Wed Feb 15 18:16:57 2017 +0100
Still run hevea in icas, upstream prefers it that way
---
debian/control | 5 ++-
debian/patches/dont-bg-hevea.patch | 25 +++++-------
debian/upstream-doc-fr/Makefile.am.Debian | 63 +++----------------------------
3 files changed, 19 insertions(+), 74 deletions(-)
diff --git a/debian/control b/debian/control
index 4adcc2f..7f1a5c8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
automake,
bison,
flex,
- hevea <!nodoc>,
libtool,
libgl2ps-dev,
libgmp3-dev,
@@ -28,7 +27,9 @@ Build-Depends:
libxext-dev,
libxft-dev,
libxinerama-dev,
+ hevea <!nodoc>,
imagemagick <!nodoc>,
+ latex2html <!nodoc>,
libjs-codemirror <!nodoc>,
libjs-mathjax <!nodoc>,
texinfo <!nodoc>,
@@ -38,7 +39,6 @@ Build-Depends:
texlive-pstricks <!nodoc>,
texlive-lang-all <!nodoc>,
texlive-latex-recommended <!nodoc>,
- latex2html <!nodoc>,
xauth <!nodoc>,
xvfb <!nodoc>,
Standards-Version: 3.9.8
@@ -79,6 +79,7 @@ Multi-Arch: allowed
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
Suggests: giac-doc,
# xcas calls system() in quite a bunch of places for optional behaviour
+ hevea,
imagemagick,
kbd,
netpbm,
diff --git a/debian/patches/dont-bg-hevea.patch b/debian/patches/dont-bg-hevea.patch
index ead06f0..63b7221 100644
--- a/debian/patches/dont-bg-hevea.patch
+++ b/debian/patches/dont-bg-hevea.patch
@@ -1,32 +1,27 @@
Description: Don't run hevea in background
- Instead, run it from other Makefile rules in the foreground
Author: Ximin Luo <infinity0 at debian.org>
Forwarded: TODO
--- a/src/icas.cc
+++ b/src/icas.cc
-@@ -494,10 +494,8 @@
+@@ -494,8 +494,8 @@
if (pos>=0 && pos<ss){
out << s << endl;
out.close();
- COUT << "File " << outfile << " created, now running hevea in background and pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << infile_ << endl;
- std::string cmd="hevea -fix "+infile_+" &";
-- system(cmd.c_str());
-- cmd="makeindex "+giac::remove_extension(outfile);
-+ COUT << "File " << outfile << " created, now running pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << infile_ << endl;
-+ std::string cmd="makeindex "+giac::remove_extension(outfile);
++ COUT << "File " << outfile << " created, now running hevea and pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << infile_ << endl;
++ std::string cmd="hevea -fix "+infile_;
system(cmd.c_str());
- cmd=("pdflatex "+giac::remove_extension(outfile)+" && mv "+giac::remove_extension(outfile)+".pdf "+infile_+".pdf");
- COUT << cmd << endl;
-@@ -705,10 +703,8 @@
+ cmd="makeindex "+giac::remove_extension(outfile);
+ system(cmd.c_str());
+@@ -705,8 +705,8 @@
if (pos>=0 && pos<ss){
out << s << endl;
out.close();
- COUT << "File " << outfile << " created, now running hevea in background and pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << giac::remove_extension(infile) << endl;
- std::string cmd="hevea -fix "+giac::remove_extension(infile)+" &";
-- system(cmd.c_str());
-- cmd=("pgiac "+outfile+" && pdflatex "+giac::remove_extension(outfile)+" && mv "+giac::remove_extension(outfile)+".pdf "+giac::remove_extension(infile)+".pdf");
-+ COUT << "File " << outfile << " created, now running pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << giac::remove_extension(infile) << endl;
-+ std::string cmd=("pgiac "+outfile+" && pdflatex "+giac::remove_extension(outfile)+" && mv "+giac::remove_extension(outfile)+".pdf "+giac::remove_extension(infile)+".pdf");
- COUT << cmd << endl;
++ COUT << "File " << outfile << " created, now running hevea and pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << giac::remove_extension(infile) << endl;
++ std::string cmd="hevea -fix "+giac::remove_extension(infile);
system(cmd.c_str());
- return;
+ cmd=("pgiac "+outfile+" && pdflatex "+giac::remove_extension(outfile)+" && mv "+giac::remove_extension(outfile)+".pdf "+giac::remove_extension(infile)+".pdf");
+ COUT << cmd << endl;
diff --git a/debian/upstream-doc-fr/Makefile.am.Debian b/debian/upstream-doc-fr/Makefile.am.Debian
index 432e7a1..f21b2e1 100644
--- a/debian/upstream-doc-fr/Makefile.am.Debian
+++ b/debian/upstream-doc-fr/Makefile.am.Debian
@@ -1,30 +1,22 @@
-# Copied from upstream but with most things stripped
-# except "keywords", and "algo.tex" and its resources and build products
-# Special build instructions for algo.pdf are from upstream:
+# Copied from upstream but with most things stripped except "keywords"
+# Plus special build instructions for algo.{pdf,html} from upstream:
# http://xcas.e.ujf-grenoble.fr/XCAS/viewtopic.php?p=8755#p8755
TEX_LOCAL = algo.tex
PDF_LOCAL = algo.pdf
-HTML_STAMPS = algo.stamp
-
-HTML_LOCAL = algo.html algo*png
+HTML_LOCAL = algo.html
FIGURES = ellipse*
-EXTRA_DIST = $(TEX_LOCAL) $(HTML_LOCAL) $(HTML_STAMPS) $(FIGURES) $(PDF_LOCAL)
+EXTRA_DIST = $(TEX_LOCAL) $(HTML_LOCAL) $(FIGURES) $(PDF_LOCAL)
the_LANG = fr
thelangdocdir = $(docdir)/$(the_LANG)
dist_thelangdoc_DATA = keywords
-html-local: $(HTML_STAMPS)
-pdf-local: $(PDF_LOCAL)
-dvi-local: $(DVI_LOCAL)
-ps-local: $(PS_LOCAL)
-
-all-local: $(PDF_LOCAL) $(HTML_STAMPS)
+all-local: $(PDF_LOCAL) $(HTML_LOCAL)
install-data-local: all-local
$(install_sh) -d $(DESTDIR)$(prefix)/share/giac/doc/$(the_LANG)
@@ -32,49 +24,6 @@ install-data-local: all-local
$(INSTALL_DATA) $(HTML_LOCAL) $(DESTDIR)$(prefix)/share/giac/doc/$(the_LANG)
$(INSTALL_DATA) $(dist_thelangdoc_DATA) $(DESTDIR)$(prefix)/share/giac/doc/$(the_LANG)
-HEVEA_OPTIONS = -fix
-# faire hevea -fix cascmd_fr ; cd cascmd_fr ; hacha ../cascmd_fr.html
-# verifier la presence de indexenv dans index.html
-LATEX2HTML_OPTIONS = -local_icons -no_math -html_version 3.2,math
-
-SUFFIXES = .stamp .tex .pdf .ps .dvi
-
-RUN_PDFLATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX)
-RUN_LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX)
-RUN_MAKEINDEX = TEXINPUTS=$(srcdir):$$TEXINPUTS $(MAKEINDEX)
-RUN_LATEX2HTML = TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX2HTML) $(LATEX2HTML_OPTIONS)
-RUN_HEVEA = TEXINPUTS=$(srcdir):$$TEXINPUTS hevea $(HEVEA_OPTIONS)
-
-.tex.pdf:
- $(RUN_PDFLATEX) $<
- $(RUN_PDFLATEX) $<
- if $(EGREP) -q -e '\\makeindex' $<; then \
- $(RUN_MAKEINDEX) `echo $@ | sed -e s/\.dvi/\.idx/` ; \
- fi
- $(RUN_PDFLATEX) $<
-
-.tex.dvi:
- $(RUN_LATEX) $<
- $(RUN_LATEX) $<
- if $(EGREP) -q -e '\\makeindex' $<; then \
- $(RUN_MAKEINDEX) `echo $@ | sed -e s/\.dvi/\.idx/` ; \
- fi
- $(RUN_LATEX) $<
-
-.dvi.ps:
- $(DVIPS) -o $@ $<
-
-.tex.stamp:
- $(RUN_HEVEA) $<
- tdir=`echo $< | sed -e 's/\.tex//'`; \
- imagen -png -pdf -mag 2000 $$tdir; \
- $(install_sh) -d $$tdir ; \
- hacha $$tdir.html -o $$tdir/index.html ; \
- touch $$tdir.png ; \
- /bin/cp -f $$tdir*.png $$tdir
-# rm -f $$tdir/*.old $$tdir/*.pl $$tdir/images.??? $$tdir/WARNINGS
- touch $@
-
install-exec-hook:
mkdir -p $(DESTDIR)$(prefix)/share/giac/doc/fr/
ln -sf ../giac.js $(DESTDIR)$(prefix)/share/giac/doc/fr/giac.js
@@ -82,5 +31,5 @@ install-exec-hook:
giacfr.tex: ../giacfr.tex
cp "$<" "$@"
-algo.pdf: algo.tex giacfr.tex
+algo.pdf algo.html: algo.tex giacfr.tex
xvfb-run ../../src/icas "$<"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/giac.git
More information about the debian-science-commits
mailing list