[petsc4py] 08/09: Docs link to system javascript from libjs-jquery, libjs-underscore

[Drew Parsons]

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

dparsons pushed a commit to tag experimental/3.8.0-1exp1
in repository petsc4py.

commit c4132c2bb6be80cd7f68a1ada201c8d6ad40784c
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Nov 3 15:06:46 2017 +0800

    Docs link to system javascript from libjs-jquery, libjs-underscore
---
 debian/changelog                | 1 +
 debian/control                  | 6 ++++--
 debian/rules                    | 7 +++++++
 debian/source/lintian-overrides | 4 +---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4679a97..b407a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ petsc4py (3.8.0-1exp1) UNRELEASED; urgency=medium
     provided in upstream tarball.
   * debian/control Priority: optional.
   * place docs package in Section: doc
+  * Link docs to system javascript from libjs-jquery, libjs-underscore
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 03 Nov 2017 14:32:40 +0800
 
diff --git a/debian/control b/debian/control
index bd4bb17..4c7ad63 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,9 @@ Build-Depends: debhelper (>= 10), dh-python,
  cython, cython3,
  python-numpy (>= 1:1.4.1-4~), python3-numpy,
  libpetsc-real3.8-dev, chrpath,
- mpi-default-dev, libhdf5-openmpi-dev
+ mpi-default-dev, libhdf5-openmpi-dev,
+ libjs-jquery (>= 3.1.0),
+ libjs-underscore (>= 1.3.1)
 X-Python-Version: >= 2.6
 Homepage: https://bitbucket.org/petsc/petsc4py
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/petsc4py.git
@@ -45,7 +47,7 @@ Description: Python 3 bindings for PETSc libraries
 Package: python-petsc4py-docs
 Architecture: all
 Section: doc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libjs-jquery (>= 3.1.0), libjs-underscore (>= 1.3.1), ${shlibs:Depends}, ${misc:Depends}
 Recommends: python-petsc4py | python3-petsc4py
 Conflicts: python-petsc
 Breaks: python-petsc4py (<< 3.7.0-3)
diff --git a/debian/rules b/debian/rules
index a81c110..b1ee400 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,13 @@ override_dh_auto_build:
 override_dh_auto_install:
 	PETSC_DIR=$(PETSC_DIR)  dh_auto_install
 
+override_dh_installdocs:
+	dh_installdocs
+	rm debian/python-petsc4py-docs/usr/share/doc/python-petsc4py-docs/usrman/_static/jquery*.js
+	ln -sf /usr/share/javascript/jquery/jquery.js debian/python-petsc4py-docs/usr/share/doc/python-petsc4py-docs/usrman/_static/jquery.js
+	rm debian/python-petsc4py-docs/usr/share/doc/python-petsc4py-docs/usrman/_static/underscore*.js
+	ln -sf /usr/share/javascript/underscore/underscore.js debian/python-petsc4py-docs/usr/share/doc/python-petsc4py-docs/usrman/_static/underscore.js
+
 override_dh_python2:
 	dh_python2
 	dh_numpy
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 5d44f17..f1167e0 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,3 @@
-# jquery.js and underscore.js are minified scripts.
-# Their human-readable source has been packed in debian/patches/include_external_source
-# and is unpacked as jquery-<upstream_version>.js and underscore-<upstream_version>.js
+# jquery.js and underscore.js have been converted to links to system libjs files
 petsc4py source: source-is-missing docs/usrman/_static/jquery.js line length is * characters (>512)
 petsc4py source: source-is-missing docs/usrman/_static/underscore.js line length is * characters (>512)

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