diff --git a/debian/control b/debian/control index 2210e798..e314a35c 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: Python modules for image processing Package: python-scikits.image-doc Architecture: all Section: doc -Depends: ${misc:Depends}, libjs-jquery, libjs-underscore +Depends: ${misc:Depends}, libjs-jquery Suggests: python-scikits.image Description: Documentation and examples for scikits-image This package contains documentation and example scripts for diff --git a/debian/python-scikits.image-doc.links b/debian/python-scikits.image-doc.links index 7e9acc12..6e8db971 100644 --- a/debian/python-scikits.image-doc.links +++ b/debian/python-scikits.image-doc.links @@ -1,2 +1 @@ usr/share/javascript/jquery/jquery.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/jquery.js -usr/share/javascript/underscore/underscore.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/underscore.js diff --git a/debian/python-scikits.image-doc.lintian-overrides b/debian/python-scikits.image-doc.lintian-overrides index 3e9a4b32..9a6b07d5 100644 --- a/debian/python-scikits.image-doc.lintian-overrides +++ b/debian/python-scikits.image-doc.lintian-overrides @@ -2,3 +2,8 @@ # python-scikits.image-doc binary: extra-license-file usr/share/doc/python-scikits.image-doc/html/_sources/license.txt + +# For easy backportability just rely on the shipped copy of underscore.js for now until problems with nodejs get resolved +# + +python-scikits.image-doc binary: embedded-javascript-library usr/share/doc/python-scikits.image-doc/html/_static/underscore.js diff --git a/debian/rules b/debian/rules index bb121983..6db21fa1 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,8 @@ endif : # Use jquery and underscore from Debian package, so prune shipped one -rm -f doc/build/html/_static/jquery.js - -rm -f doc/build/html/_static/underscore.js + # Actually due to the problems with underscore pkg across releases just ship one for now + #-rm -f doc/build/html/_static/underscore.js -rf -f doc/build/html/_sources -rf -f doc/build/html/.buildinfo