BF: use systemwide underscore.js

b459df80 · Yaroslav Halchenko · b10b9b3b · b459df80 · b459df80 · b459df80
Commit b459df80 authored 9 years ago by Yaroslav Halchenko
--- a/debian/TODO
+++ b/debian/TODO
@@ -17,13 +17,8 @@ see #609287)
 neurodebian@head2:~/deb/builds/scikit-learn/0.16.1-2$ lintian scikit-learn_0.16.1-2_amd64.changes
 E: scikit-learn source: source-is-missing doc/themes/scikit-learn/static/jquery.js
 W: scikit-learn source: invalid-short-name-in-dep5-copyright bsd (paragraph at line 10)
-W: python-sklearn-doc: embedded-javascript-library usr/share/doc/python-sklearn-doc/html/stable/_static/jquery.js please use libjs-jquery
-W: python-sklearn-doc: embedded-javascript-library usr/share/doc/python-sklearn-doc/html/stable/_static/underscore.js please use libjs-underscore
 E: python-sklearn-doc: privacy-breach-donation usr/share/doc/python-sklearn-doc/html/stable/about.html (https://www.paypalobjects.com/en_us/i/btn/btn_donatecc_lg.gif)
-E: python-sklearn-doc: privacy-breach-google-cse usr/share/doc/python-sklearn-doc/html/stable/about.html
 E: python-sklearn-doc: privacy-breach-logo usr/share/doc/python-sklearn-doc/html/stable/about.html (http://www.tinyclues.com/static/img/logo.png)
-E: python-sklearn-doc: privacy-breach-google-cse usr/share/doc/python-sklearn-doc/html/stable/auto_examples/applications/face_recognition.html
-E: python-sklearn-doc: privacy-breach-google-cse usr/share/doc/python-sklearn-doc/html/stable/auto_examples/applications/plot_model_complexity_influence.html
 ...
 E: python-sklearn-doc: privacy-breach-may-use-debian-package usr/share/doc/python-sklearn-doc/html/stable/tutorial/machine_learning_map/index.html You may use libjs-jquery package. (https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js)
 W: python-sklearn: image-file-in-usr-lib usr/lib/python2.7/dist-packages/sklearn/datasets/images/china.jpg

--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ scikit-learn (0.17.0~b1-1) UNRELEASED; urgency=medium
    - requires joblib >= 0.9.2
  * debian/patches
    - deb_disable_google_anals to disable google tracking
+  * use system-wide libjs-underscore
  *  LOOK INTO TODOS

 -- Yaroslav Halchenko <debian@onerussian.com>  Sat, 17 Oct 2015 17:47:10 -0500

--- a/debian/control
+++ b/debian/control
@@ -94,7 +94,7 @@ Conflicts: python-scikits-learn-doc
 Replaces: python-scikits-learn-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
 Suggests: python-sklearn
 Description: documentation and examples for scikit-learn
 This package contains documentation and example scripts for

--- a/debian/python-sklearn-doc.docs
+++ b/debian/python-sklearn-doc.docs
-doc/_build/html
+doc/_build/html/stable
--- a/debian/python-sklearn-doc.links
+++ b/debian/python-sklearn-doc.links
 usr/share/javascript/jquery/jquery.js usr/share/doc/python-sklearn-doc/html/_static/jquery.js
+usr/share/javascript/jquery/underscore.js usr/share/doc/python-sklearn-doc/html/_static/underscore.js
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,8 @@ else
 	echo "<HTML><BODY><P>sklearn documentation was not built.<P>Please visit <A HREF='http://scikit-learn.org'>http://scikit-learn.org</A></BODY></HTML>" >| doc/_build/html/index.html
 endif
 	: # Use jquery from Debian package, so prune shipped one
-	-rm doc/_build/html/_static/jquery.js
+	-rm doc/_build/html/stable/_static/jquery.js
+	-rm doc/_build/html/stable/_static/underscore.js
 	dh_installdocs -A AUTHORS.rst README*.rst

 override_dh_installchangelogs: