[mame] 03/05: Use packaged js copies when possible.

[Jordi Mallach]

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

jordi pushed a commit to branch master
in repository mame.

commit 611696bf8ad242274bc61ef0cd59ae6eca5a9b2d
Author: Jordi Mallach <jordi at debian.org>
Date:   Thu Sep 29 01:33:02 2016 +0200

    Use packaged js copies when possible.
    
    Exclude the install of jquery.js and underscore.js, and instead
    depend and symlink to the packaged versions.
    
    Add sphinx_mathjax_location.patch: point at the local filesystem
    path of the mathjax javascript, to avoid a privacy breach when opening
    the docs in a browser.
    
    Add depends on libjs-sphinxdoc and libjs-mathjax.
---
 debian/changelog                             |  6 ++++++
 debian/control                               |  2 +-
 debian/mame-doc.links                        |  2 ++
 debian/patches/series                        |  1 +
 debian/patches/sphinx_mathjax_location.patch | 19 +++++++++++++++++++
 debian/rules                                 |  8 +++++---
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b038661..c270ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ mame (0.178-1) UNRELEASED; urgency=medium
   * Add a new binary package mame-doc and move all the (generated) docs
     to this package.
   * Let mame suggest mame-doc.
+  * Exclude the install of jquery.js and underscore.js, and instead
+    depend and symlink to the packaged versions.
+  * Add sphinx_mathjax_location.patch: point at the local filesystem
+    path of the mathjax javascript, to avoid a privacy breach when opening
+    the docs in a browser.
+  * Add Depends on libjs-sphinxdoc and libjs-mathjax.
 
  -- Jordi Mallach <jordi at debian.org>  Wed, 28 Sep 2016 08:07:12 +0200
 
diff --git a/debian/control b/debian/control
index b1ede81..3a98856 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Description: Tools for MAME and MESS
 Package: mame-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: libjs-sphinxdoc, libjs-mathjax, ${misc:Depends}
 Enhances: mame
 Description: Documentation for MAME
  MAME is a hardware emulator: it faithfully reproduces the behavior of many
diff --git a/debian/mame-doc.links b/debian/mame-doc.links
new file mode 100644
index 0000000..1142877
--- /dev/null
+++ b/debian/mame-doc.links
@@ -0,0 +1,2 @@
+/usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/mame-doc/singlehtml/_static/jquery.js
+/usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/mame-doc/singlehtml/_static/underscore.js
diff --git a/debian/patches/series b/debian/patches/series
index a465bdc..bd2ccae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 genie_freebsd_target.patch
 hurd.patch
+sphinx_mathjax_location.patch
diff --git a/debian/patches/sphinx_mathjax_location.patch b/debian/patches/sphinx_mathjax_location.patch
new file mode 100644
index 0000000..cd444d1
--- /dev/null
+++ b/debian/patches/sphinx_mathjax_location.patch
@@ -0,0 +1,19 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Use the packaged version of MathJax.
+ Avoid a privacy breach by using the packaged version of
+ libjs-mathjax in the generated sphinx docs.
+Forwarded: no
+
+Index: mame-0.178/docs/source/conf.py
+===================================================================
+--- mame-0.178.orig/docs/source/conf.py
++++ mame-0.178/docs/source/conf.py
+@@ -38,7 +38,7 @@ edit_on_github_project = 'mamedev/docs'
+ edit_on_github_branch = 'master/source'
+ 
+ # Math
+-mathjax_path = "http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
++mathjax_path = "file:///usr/share/javascript/mathjax/config/TeX-AMS-MML_HTMLorMML.js"
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --git a/debian/rules b/debian/rules
index 59b47e5..72e928b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -196,9 +196,11 @@ override_dh_auto_test-arch:
 
 override_dh_install:
 	dh_install --fail-missing \
-               --exclude=dir.txt \
-               --exclude=LICENSE \
-               --exclude=README.md
+		   --exclude=dir.txt \
+		   --exclude=LICENSE \
+		   --exclude=README.md \
+		   --exclude=jquery.js \
+		   --exclude=underscore.js
 
 override_dh_installchangelogs:
 	dh_installchangelogs whatsnew.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git