[Python-modules-commits] r33952 - in packages/scipy/trunk/debian (changelog rules)

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

    Date: Saturday, August 22, 2015 @ 15:09:56
  Author: jcjaskula-guest
Revision: 33952

Use local system six, building weave for python3

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

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2015-08-21 21:16:58 UTC (rev 33951)
+++ packages/scipy/trunk/debian/changelog	2015-08-22 15:09:56 UTC (rev 33952)
@@ -19,6 +19,7 @@
   * Using local intersphinx objects
     - use_local_objects.patch
   * Cleaned debian/copyright
+  * Using local python-six
 
  -- Varun Hiremath <varun at debian.org>  Mon, 17 Aug 2015 19:27:21 -0400
 

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2015-08-21 21:16:58 UTC (rev 33951)
+++ packages/scipy/trunk/debian/rules	2015-08-22 15:09:56 UTC (rev 33952)
@@ -64,9 +64,14 @@
 	  ln -sf /usr/lib/python$$py/dist-packages/decorator.py $(BASE)/python-scipy/usr/lib/python$$py/dist-packages/scipy/_lib/decorator.py; \
 	done
 	ln -sf /usr/lib/python3/dist-packages/decorator.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/_lib/decorator.py
+	
+	# Using the local python-six
+	ln -sf /usr/lib/python$$py/dist-packages/six.py $(BASE)/python-scipy/usr/lib/python$$py/dist-packages/scipy/_lib/six.py; \
+	ln -sf /usr/lib/python3/dist-packages/six.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/_lib/six.py
 
 	# not ported to py3 in 0.10.1
-	rm -rf $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/weave
+	# Let's try to build weave for python3, it might be ok by now
+	#rm -rf $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/weave
         #call dh_numpy
 	dh_numpy
 	dh_numpy3