[opencv] 09/11: Add patches/change_jquery.js_path and add libjs-jquery to Depends of opencv-doc

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to branch master
in repository opencv.

commit 8851d417bdb9042026405d13fbc1c6059db1e68f
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat Aug 20 08:05:41 2016 +0900

    Add patches/change_jquery.js_path and add libjs-jquery to Depends of opencv-doc
    
    Fix lintian warning:
      opencv-doc: embedded-javascript-library usr/share/doc/opencv-doc/html/jquery.js please use libjs-jquery
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
---
 debian/changelog                     |  2 ++
 debian/control                       |  2 +-
 debian/opencv-doc.lintian-overrides  |  1 -
 debian/patches/change_jquery.js_path | 13 +++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  1 +
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ac478c..c19af68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ opencv (3.1.0+dfsg-1~exp0) UNRELEASED; urgency=medium
   * Update to 3.1.0.
   * Add patches/disable_opengl_test_build.
   * Add libjs-mathjax to Depends of opencv-doc and debian/patches/mathjax.
+  * Add libjs-jquery to Depends of opencv-doc and add
+    debian/patches/change_jquery.js_path.
   * Update Standards-Version to 3.9.8.
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Sat, 25 Jun 2016 06:15:45 +0900
diff --git a/debian/control b/debian/control
index 5393bb8..9debf2c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Homepage: http://opencv.org/
 Package: opencv-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-mathjax
+Depends: ${misc:Depends}, libjs-mathjax, libjs-jquery
 Conflicts: libopencv-doc
 Replaces: libopencv-doc
 Description: OpenCV documentation and examples
diff --git a/debian/opencv-doc.lintian-overrides b/debian/opencv-doc.lintian-overrides
deleted file mode 100644
index a93f355..0000000
--- a/debian/opencv-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-opencv-doc: embedded-javascript-library usr/share/doc/opencv-doc/html/html/jquery.js
diff --git a/debian/patches/change_jquery.js_path b/debian/patches/change_jquery.js_path
new file mode 100644
index 0000000..13ec642
--- /dev/null
+++ b/debian/patches/change_jquery.js_path
@@ -0,0 +1,13 @@
+diff --git a/doc/header.html b/doc/header.html
+index bbaf1d5..db083f4 100644
+--- a/doc/header.html
++++ b/doc/header.html
+@@ -9,7 +9,7 @@
+ <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+ <link href="$relpath^opencv.ico" rel="shortcut icon" type="image/x-icon" />
+ <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+-<script type="text/javascript" src="$relpath^jquery.js"></script>
++<script type="text/javascript" src="/usr/share/javascript/jquery/jquery.js"></script>
+ <script type="text/javascript" src="$relpath^dynsections.js"></script>
+ $treeview
+ $search
diff --git a/debian/patches/series b/debian/patches/series
index ee98cfa..058e430 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ support_x32
 # ffmpeg_2.9.patch
 disable_opengl_test_build
 mathjax
+change_jquery.js_path
diff --git a/debian/rules b/debian/rules
index 5d89f13..de95ba7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,6 +129,7 @@ override_dh_install:
 		cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; done
 
 	rm -rf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*_pch_dephelp.a
+	rm -rf debian/tmp/usr/share/OpenCV/doc/html/jquery.js
 
 	dh_install -O--buildsystem=cmake --list-missing
 

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