[geographiclib] 02/04: Use packaged jquery.js instead of Doxygen copy.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository geographiclib.

commit 7f8d50825b13ced688d9e6f8a72b0e51b7dc4c7b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 13 17:10:36 2015 +0100

    Use packaged jquery.js instead of Doxygen copy.
---
 debian/changelog               | 1 +
 debian/control                 | 3 ++-
 debian/geographiclib-doc.links | 5 +++++
 debian/rules                   | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1c54ca9..4a63f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 geographiclib (1.40-1~exp2) UNRELEASED; urgency=medium
 
   * Update my email to use @debian.org address.
+  * Use packaged jquery.js instead of Doxygen copy.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 13 Feb 2015 17:09:16 +0100
 
diff --git a/debian/control b/debian/control
index 7d1066b..158caa6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,8 @@ Description: C++ library to solve some geodesic problems -- tools
 Package: geographiclib-doc
 Architecture: all
 Section: doc
-Depends: libjs-mathjax,
+Depends: libjs-jquery,
+         libjs-mathjax,
          ${misc:Depends}
 Description: C++ library to solve some geodesic problems -- documentation
  GeographicLib is a small set of C++ classes for converting between
diff --git a/debian/geographiclib-doc.links b/debian/geographiclib-doc.links
index eb573bb..b3e7d14 100644
--- a/debian/geographiclib-doc.links
+++ b/debian/geographiclib-doc.links
@@ -1,3 +1,8 @@
+# Link packaged jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/jquery.js 
+usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/C/jquery.js 
+usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/Fortran/jquery.js 
+
 # Link duplicate document files removed in d/rules
 usr/share/doc/geographiclib/html/bc_s.png usr/share/doc/geographiclib/html/C/bc_s.png
 usr/share/doc/geographiclib/html/bc_s.png usr/share/doc/geographiclib/html/Fortran/bc_s.png
diff --git a/debian/rules b/debian/rules
index 0982dc4..76b129c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,10 @@ override_dh_install:
 	# Remove MATLAB files
 	$(RM) -r debian/tmp/usr/lib/*/GeographicLib/matlab/
 
+	# Remove embedded jQuery
+	$(RM) debian/tmp/usr/share/doc/geographiclib/html/*/jquery.js \
+	      debian/tmp/usr/share/doc/geographiclib/html/jquery.js
+
 	dh_install --list-missing
 
 override_dh_installchangelogs:

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