[python-escript] 04/04: Added debian buildflags to jessie. Fixed doco _static

[Joel Fenwick]

This is an automated email from the git hooks/post-receive script.

jfenwick-guest pushed a commit to branch debian
in repository python-escript.

commit ed1073c13f8132dd5891c9578aa4b75bad847109
Author: Joel Fenwick <joelfenwick at uq.edu.au>
Date:   Mon May 18 15:22:14 2015 +1000

    Added debian buildflags to jessie. Fixed doco _static
---
 debian/python-escript-doc.install |  5 +++--
 debian/python-escript-doc.links   | 35 +++++++++++++++++------------------
 debian/rules                      |  4 ++--
 scons/templates/jessie_options.py | 14 ++++++++++++++
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/debian/python-escript-doc.install b/debian/python-escript-doc.install
index fd8c467..07446e0 100644
--- a/debian/python-escript-doc.install
+++ b/debian/python-escript-doc.install
@@ -2,6 +2,7 @@ debian/stage2/release/doc/install/install.pdf	usr/share/doc/python-escript-doc
 debian/stage2/release/doc/user/user.pdf		usr/share/doc/python-escript-doc
 debian/stage2/release/doc/cookbook/cookbook.pdf	usr/share/doc/python-escript-doc
 debian/stage2/release/doc/inversion/inversion.pdf	usr/share/doc/python-escript-doc/
-debian/stage2/release/doc/sphinx_api 		usr/share/doc/python-escript-doc/python_html
+debian/stage2/release/doc/sphinx_api/* 		usr/share/doc/python-escript-doc/python_html
+debian/stage2/release/doc/sphinx_api/_static/basic.css	usr/share/doc/python-escript-doc/python_html/_static
 debian/stage2/release/doc/doxygen 		usr/share/doc/python-escript-doc/doxygen
-debian/copyright	usr/share/doc/python-escript-doc
+debian/copyright				usr/share/doc/python-escript-doc
diff --git a/debian/python-escript-doc.links b/debian/python-escript-doc.links
index d97940c..7ce81e1 100644
--- a/debian/python-escript-doc.links
+++ b/debian/python-escript-doc.links
@@ -1,19 +1,18 @@
-/usr/share/sphinx/themes/basic/static/ajax-loader.gif	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/ajax-loader.gif
-/usr/share/javascript/sphinxdoc/1.0/basic.css 		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/basic.css
-/usr/share/sphinx/themes/basic/static/comment-bright.png usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/comment-bright.png
-/usr/share/sphinx/themes/basic/static/comment-close.png usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/comment-close.png
-/usr/share/sphinx/themes/basic/static/comment.png	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/comment.png
-/usr/share/sphinx/themes/basic/static/doctools.js	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/doctools.js
-/usr/share/sphinx/themes/basic/static/down.png		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/down.png
-/usr/share/sphinx/themes/basic/static/down-pressed.png	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/down-pressed.png
-/usr/share/sphinx/themes/basic/static/file.png		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/file.png
-/usr/share/sphinx/themes/basic/static/jquery.js		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/jquery.js
-/usr/share/sphinx/themes/basic/static/minus.png		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/minus.png
-/usr/share/sphinx/themes/basic/static/plus.png		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/plus.png
-/usr/share/javascript/sphinxdoc/1.0/searchtools.js	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/searchtools.js
-/usr/share/javascript/sphinxdoc/1.0/sidebar.js		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/sidebar.js
-/usr/share/sphinx/themes/basic/static/underscore.js	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/underscore.js
-/usr/share/sphinx/themes/basic/static/up.png		usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/up.png
-/usr/share/sphinx/themes/basic/static/up-pressed.png	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/up-pressed.png
-/usr/share/sphinx/themes/basic/static/websupport.js	usr/share/doc/python-escript-doc/python_html/sphinx_api/_static/websupport.js
+/usr/share/sphinx/themes/basic/static/ajax-loader.gif	usr/share/doc/python-escript-doc/python_html/_static/ajax-loader.gif
+/usr/share/sphinx/themes/basic/static/comment-bright.png usr/share/doc/python-escript-doc/python_html/_static/comment-bright.png
+/usr/share/sphinx/themes/basic/static/comment-close.png usr/share/doc/python-escript-doc/python_html/_static/comment-close.png
+/usr/share/sphinx/themes/basic/static/comment.png	usr/share/doc/python-escript-doc/python_html/_static/comment.png
+/usr/share/sphinx/themes/basic/static/doctools.js	usr/share/doc/python-escript-doc/python_html/_static/doctools.js
+/usr/share/sphinx/themes/basic/static/down.png		usr/share/doc/python-escript-doc/python_html/_static/down.png
+/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/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
+/usr/share/javascript/sphinxdoc/1.0/sidebar.js		usr/share/doc/python-escript-doc/python_html/_static/sidebar.js
+/usr/share/sphinx/themes/basic/static/underscore.js	usr/share/doc/python-escript-doc/python_html/_static/underscore.js
+/usr/share/sphinx/themes/basic/static/up.png		usr/share/doc/python-escript-doc/python_html/_static/up.png
+/usr/share/sphinx/themes/basic/static/up-pressed.png	usr/share/doc/python-escript-doc/python_html/_static/up-pressed.png
+/usr/share/sphinx/themes/basic/static/websupport.js	usr/share/doc/python-escript-doc/python_html/_static/websupport.js
 
diff --git a/debian/rules b/debian/rules
index 8a29ac9..28ec5f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -221,11 +221,11 @@ binary-indep:
 	dh_install 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_installchangelogs	-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST) debian/changelog.trivial
 	dh_installexamples	-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
-	dh_link -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
+	dh_link 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_lintian 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_compress 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_fixperms 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
-	dh_strip			-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
+	dh_strip		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_installdeb 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_gencontrol 		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
 	dh_md5sums		-ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
diff --git a/scons/templates/jessie_options.py b/scons/templates/jessie_options.py
index 4c99ec8..4e8bc40 100644
--- a/scons/templates/jessie_options.py
+++ b/scons/templates/jessie_options.py
@@ -306,3 +306,17 @@ build_shared = True
 # DEFAULT: False
 #papi_instrument_solver = True
 
+
+from site_init import getdebbuildflags
+# Now we add the debian build flags
+debstuff=getdebbuildflags()
+if (len(debstuff)>0):
+  print("Building with the following additional flags from debian: "+str(debstuff))
+for i in debstuff:
+  k=i[0]
+  v=i[1]
+  try:
+    exec(k+"+=' "+v+"'")
+  except NameError:   
+    exec(k+"='"+v+"'")
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git