[giac] 01/01: Update d/changelog, refresh patches
Ximin Luo
infinity0 at debian.org
Sun Jun 25 19:16:31 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 d44dddb16bca126d1251f90f6f634d9b0b35d06e
Author: Ximin Luo <infinity0 at debian.org>
Date: Sun Jun 25 21:16:25 2017 +0200
Update d/changelog, refresh patches
---
debian/changelog | 6 ++
debian/patches/dont-bg-hevea.patch | 20 ++---
debian/patches/dont-build-files-excluded.patch | 15 +++-
debian/patches/dont-include-remote-scripts.patch | 105 +++++++++++++----------
debian/patches/find-doc-files-at-buildtime.patch | 6 +-
5 files changed, 88 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 782fbdb..f7ce805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+giac (1.2.3.51+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Ximin Luo <infinity0 at debian.org> Sat, 24 Jun 2017 15:06:01 +0200
+
giac (1.2.3.25+dfsg1-4) unstable; urgency=medium
* Split arch-dependent vs -independent builds to try to avoid failures
diff --git a/debian/patches/dont-bg-hevea.patch b/debian/patches/dont-bg-hevea.patch
index 63b7221..d9aeea2 100644
--- a/debian/patches/dont-bg-hevea.patch
+++ b/debian/patches/dont-bg-hevea.patch
@@ -3,18 +3,16 @@ Author: Ximin Luo <infinity0 at debian.org>
Forwarded: TODO
--- a/src/icas.cc
+++ b/src/icas.cc
-@@ -494,8 +494,8 @@
- if (pos>=0 && pos<ss){
- out << s << endl;
+@@ -523,7 +523,7 @@
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_+" &";
-+ 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="makeindex "+giac::remove_extension(outfile);
- system(cmd.c_str());
-@@ -705,8 +705,8 @@
+ COUT << "File " << outfile << " created" << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl ;
+ if (dohevea){
+- std::string cmd="hevea -fix "+infile_+" &";
++ std::string cmd="hevea -fix "+infile_;
+ COUT << "Running " << cmd << endl;
+ system(cmd.c_str());
+ }
+@@ -749,8 +749,8 @@
if (pos>=0 && pos<ss){
out << s << endl;
out.close();
diff --git a/debian/patches/dont-build-files-excluded.patch b/debian/patches/dont-build-files-excluded.patch
index 78486ae..92b82d1 100644
--- a/debian/patches/dont-build-files-excluded.patch
+++ b/debian/patches/dont-build-files-excluded.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
$(PACKAGE)-$(VERSION).tar.gz: dist
--- a/configure.in
+++ b/configure.in
-@@ -398,8 +398,6 @@
+@@ -399,8 +399,6 @@
doc/es/Makefile
doc/fr/Makefile
doc/el/Makefile
@@ -24,7 +24,7 @@ Forwarded: not-needed
doc/local/Makefile
doc/pt/Makefile
doc/zh/Makefile
-@@ -407,8 +405,6 @@
+@@ -408,8 +406,6 @@
intl/Makefile
po/Makefile.in
examples/Makefile
@@ -64,8 +64,8 @@ Forwarded: not-needed
@@ -1,6 +1,6 @@
SUBDIRS = en es fr el local pt zh de
DIST_SUBDIRS = en es fr el local pt zh de
--XCASHTML = xcasfr.html xcasen.html codemirror.css codemirror.js xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html
-+XCASHTML = xcasfr.html xcasen.html xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html
+-XCASHTML = xcasfr.html xcasen.html codemirror.css codemirror.js xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html menufr.js menuen.js show-hint.js show-hint.css w3data.js algoseconde.html
++XCASHTML = xcasfr.html xcasen.html xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html menufr.js menuen.js algoseconde.html
EXTRA_DIST = aide_cas README index.html $(XCASHTML) dxcas/* pari/*
dist_pkgdata_DATA = aide_cas
@@ -82,6 +82,13 @@ Forwarded: not-needed
$(INSTALL_DATA) $(top_srcdir)/doc/index.html $(DESTDIR)$(prefix)/share/giac/doc/
$(INSTALL_DATA) $(top_srcdir)/doc/README $(DESTDIR)$(prefix)/share/giac/doc/
ln -sf ../aide_cas $(DESTDIR)$(prefix)/share/giac/doc/aide_cas
+@@ -25,3 +23,6 @@
+
+ testfr.html:
+ hevea -fix testfr
++
++algoseconde.html:
++ hevea -fix algoseconde
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,6 +1,6 @@
diff --git a/debian/patches/dont-include-remote-scripts.patch b/debian/patches/dont-include-remote-scripts.patch
index c90f39a..640df2d 100644
--- a/debian/patches/dont-include-remote-scripts.patch
+++ b/debian/patches/dont-include-remote-scripts.patch
@@ -1,39 +1,30 @@
Description: Don't include remote scripts
We have them in Debian, use those
+ sed -i \
+ -e 's,{giacjsonline},{giacjshere},g' \
+ -e 's,http://cdn.mathjax.org/mathjax/latest/,file:///usr/share/javascript/mathjax/,g' \
+ -e '/^%\loadgiacjsonline/d' \
+ doc/testfr.tex doc/test.tex doc/giac.tex doc/giacfr.tex doc/xcasen.html doc/xcasfr.html
+ then refresh, pop, and manually remove false positives from this patch, e.g.
+ %%comments and \verb literals.
Author: Ximin Luo <infinity0 at debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/doc/testfr.tex
-+++ b/doc/testfr.tex
-@@ -60,7 +60,7 @@
-
-
- \begin{document}
--\begin{giacjsonline}
-+\begin{giacjshere}
- %\loadgiacjs
- %\loadgiacjsonline
-
-@@ -170,5 +170,5 @@
- \verb|\giaclink{http://www-fourier.ujf-grenoble.fr/\%7eparisse/xcasfr.html#+factor(x^4-1)&+a:=idn(3)&}|\index{giaclink}\\
- \giaclink{http://www-fourier.ujf-grenoble.fr/\%7eparisse/xcasfr.html#+factor(x^4-1)&+a:=idn(3)&}
-
--\end{giacjsonline}
-+\end{giacjshere}
- \end{document}
--- a/doc/test.tex
+++ b/doc/test.tex
-@@ -61,7 +61,7 @@
+@@ -59,9 +59,8 @@
+ \makeindex
+
\begin{document}
- %\loadgiacjsonline
+-%\loadgiacjsonline
%\loadgiacjs
-\begin{giacjsonline}
+\begin{giacjshere}
\maketitle
\tableofcontents
-@@ -158,5 +158,5 @@
+@@ -164,5 +163,5 @@
\verb|\giacslider{a}{-5}{5}{0.1}{0}{plot(sin(a*x))}|\index{giacslider}\\
\giacslider{a}{-5}{5}{0.1}{0}{plot(sin(a*x))}
@@ -42,7 +33,25 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
\end{document}
--- a/doc/giac.tex
+++ b/doc/giac.tex
-@@ -270,7 +270,7 @@
+@@ -59,7 +59,7 @@
+ }
+ \loadgiacscriptend
+ }
+-\newenvironment{giacjsonline}[1]["max-height: 500px; overflow:auto"]
++\newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]
+ {\loadgiacmain{#1}
+ }
+ {
+@@ -86,7 +86,7 @@
+ \newenvironment{giacjs}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacparijs}[1]["max-height: 500px; overflow:auto"]{}{}
+-\newenvironment{giacjsonline}[1]["max-height: 500px; overflow:auto"]{}{}
++\newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacparijsonline}[1]["max-height: 500px; overflow:auto"]{}{}
+ \fi
+ \newcommand{\loadgiacscriptstart}{
+@@ -348,7 +348,7 @@
if (UI.usemathjax){
var script = document.createElement("script");
script.type = "text/javascript";
@@ -53,7 +62,25 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
var elem= document.getElementById('controlindex');
--- a/doc/giacfr.tex
+++ b/doc/giacfr.tex
-@@ -265,7 +265,7 @@
+@@ -58,7 +58,7 @@
+ }
+ \loadgiacscriptend
+ }
+-\newenvironment{giacjsonline}[1]["max-height: 500px; overflow:auto"]
++\newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]
+ {\loadgiacmain{#1}
+ }
+ {
+@@ -85,7 +85,7 @@
+ \newenvironment{giacjs}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacparijs}[1]["max-height: 500px; overflow:auto"]{}{}
+-\newenvironment{giacjsonline}[1]["max-height: 500px; overflow:auto"]{}{}
++\newenvironment{giacjshere}[1]["max-height: 500px; overflow:auto"]{}{}
+ \newenvironment{giacparijsonline}[1]["max-height: 500px; overflow:auto"]{}{}
+ \fi
+ \newcommand{\loadgiacscriptstart}{
+@@ -342,7 +342,7 @@
if (UI.usemathjax){
var script = document.createElement("script");
script.type = "text/javascript";
@@ -62,25 +89,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
document.getElementsByTagName("head")[0].appendChild(script);
}
var elem= document.getElementById('controlindex');
---- a/doc/xcasen.html
-+++ b/doc/xcasen.html
-@@ -167,7 +167,7 @@
- (function () {
- var script = document.createElement("script");
- script.type = "text/javascript";
-- script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
-+ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
- document.getElementsByTagName("head")[0].appendChild(script);
- })();
- }
---- a/doc/xcasfr.html
-+++ b/doc/xcasfr.html
-@@ -2940,7 +2940,7 @@
- (function () {
- var script = document.createElement("script");
- script.type = "text/javascript";
-- script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_CHTML";
-+ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS_CHTML";
- document.getElementsByTagName("head")[0].appendChild(script);
- })();
- }
+--- a/doc/testfr.tex
++++ b/doc/testfr.tex
+@@ -77,7 +77,6 @@
+ \begin{document}
+ \begin{giacjshere}
+ %\loadgiacjs
+-%\loadgiacjsonline
+ Un $x$
+ $$ 1/2 $$
+
diff --git a/debian/patches/find-doc-files-at-buildtime.patch b/debian/patches/find-doc-files-at-buildtime.patch
index c10593a..514b562 100644
--- a/debian/patches/find-doc-files-at-buildtime.patch
+++ b/debian/patches/find-doc-files-at-buildtime.patch
@@ -4,11 +4,9 @@ Description: Allow XCAS_ROOT override, so doc files can be found during the buil
Author: Ximin Luo <infinity0 at debian.org>
Forwarded: not-needed
-diff --git a/src/global.cc b/src/global.cc
-index 49bff8b..00e1d6f 100755
--- a/src/global.cc
+++ b/src/global.cc
-@@ -2551,6 +2551,10 @@ extern "C" void Sleep(unsigned int miliSecond);
+@@ -2567,6 +2567,10 @@
if (!access((xcasroot()+"aide_cas").c_str(),R_OK)){
return xcasroot();
}
@@ -19,7 +17,7 @@ index 49bff8b..00e1d6f 100755
if (xcasroot().size()>4 && xcasroot().substr(xcasroot().size()-4,4)=="bin/"){
string s(xcasroot().substr(0,xcasroot().size()-4));
s+="share/giac/";
-@@ -2561,10 +2565,6 @@ extern "C" void Sleep(unsigned int miliSecond);
+@@ -2577,10 +2581,6 @@
#ifdef __APPLE__
if (!access("/Applications/usr/share/giac/",R_OK))
return "/Applications/usr/share/giac/";
--
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