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

[morph at users.alioth.debian.org]

    Date: Monday, September 14, 2015 @ 20:08:41
  Author: morph
Revision: 34251

* debian/rules
  - replace JS libraries in all the py3k version of the package; thanks to
    Barry Warsaw for the report and patch; Closes: #792310

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2015-09-14 19:46:43 UTC (rev 34250)
+++ packages/matplotlib/trunk/debian/changelog	2015-09-14 20:08:41 UTC (rev 34251)
@@ -1,3 +1,11 @@
+matplotlib (1.4.3-2) UNRELEASED; urgency=medium
+
+  * debian/rules
+    - replace JS libraries in all the py3k version of the package; thanks to
+      Barry Warsaw for the report and patch; Closes: #792310
+
+ -- Sandro Tosi <morph at debian.org>  Mon, 14 Sep 2015 21:07:24 +0100
+
 matplotlib (1.4.3-1) experimental; urgency=medium
 
   * New upstream release

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2015-09-14 19:46:43 UTC (rev 34250)
+++ packages/matplotlib/trunk/debian/rules	2015-09-14 20:08:41 UTC (rev 34251)
@@ -151,6 +151,11 @@
 	dh_testdir
 	dh_testroot
 
+	-rm $(CURDIR)/debian/$(p3)/usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/js/jquery-1.7.1.min.js
+	-rm $(CURDIR)/debian/$(p3)/usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/js/jquery-ui.min.js
+	-rm $(CURDIR)/debian/$(p3)/usr/lib/python3/dist-packages/matplotlib/backends/web_backend/jquery/css/themes/base/jquery-ui.min.css
+
+
 	python$* ./setup.py install_lib \
 		-d $(CURDIR)/debian/$(p3)/usr/lib/python3/dist-packages/ --no-compile
 	python$* ./setup.py install_egg_info \
@@ -172,12 +177,14 @@
 	rm -rf $(CURDIR)/debian/$(p3dbg)/usr/lib/python3/dist-packages/matplotlib/backends/Matplotlib.nib/
 
 	# replace minified jquery with packaged version and hope it works
-	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
+	for i in $(PY3VERS); do \
+	    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; \
+	done
 
 	touch $@