[gmt] 07/07: Use packaged jquery.js & underscore.js instead of embedded sphinx copies.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gmt.

commit d223b4894c9c5722e4e483ff06af4116e7b4c464
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 8 23:22:32 2015 +0200

    Use packaged jquery.js & underscore.js instead of embedded sphinx copies.
---
 debian/changelog     | 1 +
 debian/control       | 4 +++-
 debian/gmt-doc.links | 2 ++
 debian/rules         | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 153dcf6..6c65754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ gmt (5.1.2+dfsg1-1) UNRELEASED; urgency=medium
   * Strip RPATH from binary & libraries.
   * Also exclude prebuilt documentation and manpages from repacked source.
   * Build documentation in build-indep target.
+  * Use packaged jquery.js & underscore.js instead of embedded sphinx copies.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Jun 2015 12:06:29 +0200
 
diff --git a/debian/control b/debian/control
index c945ab4..7411808 100644
--- a/debian/control
+++ b/debian/control
@@ -121,7 +121,9 @@ Description: Tutorial for GMT, the Generic Mapping Tools (PDF)
 Package: gmt-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery,
+         libjs-underscore,
+         ${misc:Depends}
 Suggests: www-browser
 Conflicts: gmt (<< 4.5.7-1~)
 Description: HTML documentation for GMT, the Generic Mapping Tools
diff --git a/debian/gmt-doc.links b/debian/gmt-doc.links
new file mode 100644
index 0000000..dcfe24a
--- /dev/null
+++ b/debian/gmt-doc.links
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js         usr/share/doc/gmt/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/gmt/html/_static/underscore.js
diff --git a/debian/rules b/debian/rules
index 66a9c8c..d6be5e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,10 @@ override_dh_auto_install:
 	chmod -x debian/tmp/usr/share/gmt/tools/gmt_functions.sh \
 	         debian/tmp/usr/share/gmt/tools/gmt_aliases.csh
 
+	# Remove embedded sphinx copies of JS libraries in favor of packaged ones
+	rm -f debian/tmp/usr/share/doc/gmt/html/_static/jquery.js \
+	      debian/tmp/usr/share/doc/gmt/html/_static/underscore.js
+
 	# Fix bash-completion installation
 	mkdir -p debian/tmp/usr/share/bash-completion/completions
 	mv debian/tmp/usr/etc/bash_completion.d/gmt debian/tmp/usr/share/bash-completion/completions

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