[theano] 01/02: Re-minify libjs-d3 to work around #745688

[Rebecca Palmer]

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

rnpalmer-guest pushed a commit to branch master
in repository theano.

commit 38139147fcf48e9c026294dced79837855cd8c15
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Fri Sep 29 08:04:21 2017 +0100

    Re-minify libjs-d3 to work around #745688
---
 debian/changelog            | 3 ++-
 debian/control              | 6 ++----
 debian/python-theano.links  | 1 -
 debian/python3-theano.links | 1 -
 debian/rules                | 4 +++-
 debian/theano-doc.links     | 1 -
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70f0f4a..b09249a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,8 @@ theano (0.9.0+dfsg-1) UNRELEASED; urgency=medium
   * Make tests work with older nose-parameterized.
   * Use python(3)-dev not -all-dev.  (Closes: #867370)
   * Remove pre-minified Javascript, and instead minify at build time.
-  * Use libjs-d3 instead of the embedded copy.
+  * Use libjs-d3 instead of the embedded copy, but re-minify to
+    work around #745688.
   * Delete doc/.pybuild on clean.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Mon, 18 Sep 2017 22:15:10 +0100
diff --git a/debian/control b/debian/control
index 3f557ff..bfe4707 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,8 @@ Build-Depends:
  node-browserify-lite,
  node-uglify,
  node-pegjs,
- node-lodash-compat
+ node-lodash-compat,
+ libjs-d3
 Standards-Version: 4.1.0
 Homepage: http://www.deeplearning.net/software/theano/
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/theano.git
@@ -51,7 +52,6 @@ Depends:
  ${python:Depends},
  python-dev,
  libblas-dev | libblas.so,
- libjs-d3,
  ${misc:Depends}
 Recommends:
  g++,
@@ -84,7 +84,6 @@ Depends:
  ${python3:Depends},
  python3-dev,
  libblas-dev | libblas.so,
- libjs-d3,
  ${misc:Depends}
 Recommends:
  g++,
@@ -112,7 +111,6 @@ Architecture: all
 Section: doc
 Depends:
  ${sphinxdoc:Depends},
- libjs-d3,
  ${misc:Depends}
 Recommends:
  python-theano,
diff --git a/debian/python-theano.links b/debian/python-theano.links
deleted file mode 100644
index 8bbdeda..0000000
--- a/debian/python-theano.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/d3/d3.min.js usr/lib/python/dist-packages/theano/d3viz/js/d3.v3.min.js
diff --git a/debian/python3-theano.links b/debian/python3-theano.links
deleted file mode 100644
index c3f4a20..0000000
--- a/debian/python3-theano.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/d3/d3.min.js usr/lib/python3/dist-packages/theano/d3viz/js/d3.v3.min.js
diff --git a/debian/rules b/debian/rules
index 5a8a9c6..37eef01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,8 @@ override_dh_auto_build:
 	#dagre-d3.js
 	browserify-lite ./debian/missing-source/dagre-d3/index.js --outfile debian/missing-source/dagre-d3.js --standalone dagreD3
 	uglifyjs debian/missing-source/dagre-d3.js --comments '@license' -o theano/d3viz/js/dagre-d3.min.js
+	#d3 - workaround for #745688
+	uglifyjs /usr/share/javascript/d3/d3.js -m -c --comments '@license' -o theano/d3viz/js/d3.v3.min.js
 	cp theano/d3viz/js/*.min.js doc/library/d3viz/examples/d3viz/js
 	#theano itself doesn't need a build as such
 
@@ -48,4 +50,4 @@ override_dh_compress:
 	dh_compress -X.py -X.ipynb -X.pdf # save theano-doc/html/_downloads
 
 override_dh_gencontrol:
-	dh_gencontrol -- -VjavascriptBU="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W node-lodash-compat)"
+	dh_gencontrol -- -VjavascriptBU="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W node-lodash-compat)$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W libjs-d3)"
diff --git a/debian/theano-doc.links b/debian/theano-doc.links
deleted file mode 100644
index 8fe1876..0000000
--- a/debian/theano-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/d3/d3.min.js usr/share/doc/theano-doc/html/_static/d3viz/js/d3.v3.min.js

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