[Python-modules-commits] r33962 - in packages/scipy/trunk/debian (control rules)

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

    Date: Sunday, August 23, 2015 @ 19:28:44
  Author: jcjaskula-guest
Revision: 33962

Using embedded python-six, system libraries are not compatible

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

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2015-08-23 19:23:30 UTC (rev 33961)
+++ packages/scipy/trunk/debian/control	2015-08-23 19:28:44 UTC (rev 33962)
@@ -26,7 +26,6 @@
                python3-nose,
                python3-numpy (>= 1:1.7.2),
                python3-numpy-dbg,
-	       python-six,python3-six
 Build-Depends-Indep: dvipng,
                      python-docutils,
                      python-matplotlib,

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2015-08-23 19:23:30 UTC (rev 33961)
+++ packages/scipy/trunk/debian/rules	2015-08-23 19:28:44 UTC (rev 33962)
@@ -66,8 +66,8 @@
 	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
+	#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
 	# Let's try to build weave for python3, it might be ok by now