[python-escript] 01/01: Fix compilation (not completely).
Anton Gladky
gladk at moszumanska.debian.org
Sun Dec 13 19:13:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch debian
in repository python-escript.
commit dae1a0b95758f8c5755bd3f3a416124ea9433a2c
Author: Anton Gladky <gladk at debian.org>
Date: Sun Dec 13 20:13:37 2015 +0100
Fix compilation (not completely).
---
debian/control | 1 +
debian/python-escript-doc.links | 1 +
debian/utils/getsubst | 2 ++
debian/utils/subst/jessie.subst | 8 ++++----
debian/utils/tweak.sh | 1 +
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index f9adacf..9d700ea 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: python-all-dev (>= 2.6.6-3~),
libboost-python-dev,
libboost-random-dev,
libnetcdf-dev,
+ lsb-release,
scons,
zip,
python-sphinx,
diff --git a/debian/python-escript-doc.links b/debian/python-escript-doc.links
index 7ce81e1..96325da 100644
--- a/debian/python-escript-doc.links
+++ b/debian/python-escript-doc.links
@@ -7,6 +7,7 @@
/usr/share/sphinx/themes/basic/static/down-pressed.png usr/share/doc/python-escript-doc/python_html/_static/down-pressed.png
/usr/share/sphinx/themes/basic/static/file.png usr/share/doc/python-escript-doc/python_html/_static/file.png
/usr/share/sphinx/themes/basic/static/jquery.js usr/share/doc/python-escript-doc/python_html/_static/jquery.js
+/usr/share/sphinx/themes/basic/static/jquery.js usr/share/doc/python-escript-doc/c++_html/jquery.js
/usr/share/sphinx/themes/basic/static/minus.png usr/share/doc/python-escript-doc/python_html/_static/minus.png
/usr/share/sphinx/themes/basic/static/plus.png usr/share/doc/python-escript-doc/python_html/_static/plus.png
/usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/python-escript-doc/python_html/_static/searchtools.js
diff --git a/debian/utils/getsubst b/debian/utils/getsubst
index e443e6b..8c880fb 100755
--- a/debian/utils/getsubst
+++ b/debian/utils/getsubst
@@ -16,6 +16,8 @@ case "$distr" in
"trusty") opf="trusty";;
"utopic") opf="utopic";;
"vivid") opf="vivid";;
+ "stretch") opf="jessie";;
+ "sid") opf="jessie";;
*) echo "No file found" >&2; exit 1;;
esac
rm -f debian/substvars
diff --git a/debian/utils/subst/jessie.subst b/debian/utils/subst/jessie.subst
index 94ff9c7..e58df0a 100644
--- a/debian/utils/subst/jessie.subst
+++ b/debian/utils/subst/jessie.subst
@@ -1,10 +1,10 @@
es:python=python2.7, libpython2.7
-es:boostpy=libboost-python1.55.0
-es:boostrandom=libboost-random1.55.0
+es:boostpy=libboost-python1.58.0
+es:boostrandom=libboost-random1.58.0
es:netcdf=libnetcdfc7, libnetcdfc++4
es:doc=python-sphinx
es:python3=python3.4, libpython3.4
-es:boostpy3=libboost-python1.55.0
-es:boostrandom3=libboost-random1.55.0
+es:boostpy3=libboost-python1.58.0
+es:boostrandom3=libboost-random1.58.0
diff --git a/debian/utils/tweak.sh b/debian/utils/tweak.sh
index d90bdf4..6e3ee8e 100755
--- a/debian/utils/tweak.sh
+++ b/debian/utils/tweak.sh
@@ -34,3 +34,4 @@ sed -i -e "s%PYTHON_CMD=python%PYTHON_CMD=python3%" $WORK3M/bin/run-escript3-mpi
# documentation
sed -i -e 's%<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>%%' $WORK/release/doc/sphinx_api/*.html
+sed -i -e 's%<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>%%' $WORK/release/doc/sphinx_api/*.html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git
More information about the debian-science-commits
mailing list