[Python-modules-commits] r29678 - in packages/matplotlib/trunk/debian (changelog control rules)

[jtaylor-guest at users.alioth.debian.org]

    Date: Monday, July 7, 2014 @ 18:14:35
  Author: jtaylor-guest
Revision: 29678

depend and use packaged jquery instead of shipped minified variants (Closes: #737438)

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/control
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2014-07-07 18:14:31 UTC (rev 29677)
+++ packages/matplotlib/trunk/debian/changelog	2014-07-07 18:14:35 UTC (rev 29678)
@@ -18,6 +18,8 @@
   * add python{,3}-tk-dbg build depends for debugging enabled tk backend
     (Closes: #714948)
   * add autopkg tests for the basic backends
+  * depend and use packaged jquery instead of shipped minified variants
+    (Closes: #737438)
 
  -- Sandro Tosi <morph at debian.org>  Sat, 19 Apr 2014 23:04:06 +0200
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2014-07-07 18:14:31 UTC (rev 29677)
+++ packages/matplotlib/trunk/debian/control	2014-07-07 18:14:35 UTC (rev 29678)
@@ -73,6 +73,8 @@
          python-matplotlib-data (>= ${source:Version}),
          python-pyparsing,
          python-tz,
+         libjs-jquery,
+         libjs-jquery-ui,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -116,6 +118,8 @@
          python3-pyparsing,
          python3-six,
          python3-tz,
+         libjs-jquery,
+         libjs-jquery-ui,
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2014-07-07 18:14:31 UTC (rev 29677)
+++ packages/matplotlib/trunk/debian/rules	2014-07-07 18:14:35 UTC (rev 29678)
@@ -125,6 +125,22 @@
 	rm -rf $(CURDIR)/debian/$(pdbg)/usr/lib/python$*/site-packages/matplotlib/mpl-data/
 	rm -rf $(CURDIR)/debian/$(pdbg)/usr/lib/python$*/site-packages/matplotlib/backends/Matplotlib.nib/
 
+	# replace minified jquery with packaged version and hope it works
+	for i in $(PY2VERS); do \
+	    dh_link -ppython-matplotlib usr/share/javascript/jquery/jquery.min.js \
+	      usr/lib/python$$i/site-packages/matplotlib/backends/web_backend/jquery/js/jquery-1.7.1.min.js; \
+	    dh_link -ppython-matplotlib usr/share/javascript/jquery-ui/jquery-ui.min.js \
+	      usr/lib/python$$i/site-packages/matplotlib/backends/web_backend/jquery/js/jquery-ui.min.js; \
+	    dh_link -ppython-matplotlib usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css \
+	      usr/lib/python$$i/site-packages/matplotlib/backends/web_backend/jquery/css/themes/base/jquery-ui.min.css; \
+	done
+	dh_link -ppython3-matplotlib usr/share/javascript/jquery/jquery.min.js \
+	  usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/js/jquery-1.7.1.min.js
+	dh_link -ppython3-matplotlib usr/share/javascript/jquery-ui/jquery-ui.min.js \
+	  usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/js/jquery-ui.min.js
+	dh_link  -ppython3-matplotlib usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css \
+	  usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/css/themes/base/jquery-ui.min.css
+
 	touch $@
 
 install-py3-%-stamp: build-%-stamp