[grass] 11/16: Use packaged jQuery in HTML documentation.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 6c2626252205ec6057760722d51436ae5ced8b71
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 9 16:56:06 2016 +0200

    Use packaged jQuery in HTML documentation.
---
 debian/changelog            |  1 +
 debian/grass-doc.links      |  1 +
 debian/grass-doc.links.in   |  1 +
 debian/patches/jquery.patch | 15 +++++++++++++++
 debian/patches/series       |  1 +
 5 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 146198d..388a49d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ grass (7.2.0~rc1-1) UNRELEASED; urgency=medium
     - Add license & copyright for lz4.{c,h} & jquery.fixedheadertable
     - Rename MIT license shortname to Expat
   * Add jquery.fixedheadertable.js to missing-sources.
+  * Use packaged jQuery in HTML documentation.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 12:44:55 +0200
 
diff --git a/debian/grass-doc.links b/debian/grass-doc.links
index 4dfcf7d..999764e 100644
--- a/debian/grass-doc.links
+++ b/debian/grass-doc.links
@@ -1 +1,2 @@
 usr/share/doc/grass-doc/html usr/lib/grass72/docs/html
+usr/share/javascript/jquery  usr/share/doc/grass-doc/html/jquery
diff --git a/debian/grass-doc.links.in b/debian/grass-doc.links.in
index 014dee0..9717840 100644
--- a/debian/grass-doc.links.in
+++ b/debian/grass-doc.links.in
@@ -1 +1,2 @@
 usr/share/doc/grass-doc/html usr/lib/grass at VERSION@/docs/html
+usr/share/javascript/jquery  usr/share/doc/grass-doc/html/jquery
diff --git a/debian/patches/jquery.patch b/debian/patches/jquery.patch
new file mode 100644
index 0000000..5dfd9e4
--- /dev/null
+++ b/debian/patches/jquery.patch
@@ -0,0 +1,15 @@
+Description: Use packaged jQuery.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/man/build_html.py
++++ b/man/build_html.py
+@@ -330,7 +330,7 @@ headerpso_tmpl = \
+ r"""
+ <link rel="stylesheet" href="grassdocs.css" type="text/css">
+ <link rel="stylesheet" href="parser_standard_options.css" type="text/css">
+-<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
++<script src="jquery/jquery.min.js"></script>
+ <script type="text/javascript" src="jquery.fixedheadertable.min.js"></script>
+ <script type="text/javascript" src="parser_standard_options.js"></script>
+ </head>
diff --git a/debian/patches/series b/debian/patches/series
index 468ac73..e8223ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ pager
 instdir
 no-fail-html.patch
 appstream.patch
+jquery.patch

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