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

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

    Date: Tuesday, May 27, 2014 @ 23:49:55
  Author: jtaylor-guest
Revision: 29111

use embedded six, current unstable version not compatible

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

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2014-05-27 23:49:52 UTC (rev 29110)
+++ packages/scipy/trunk/debian/control	2014-05-27 23:49:55 UTC (rev 29111)
@@ -19,14 +19,12 @@
                python-nose,
                python-numpy (>= 1:1.5.1),
                python-numpy-dbg (>= 1:1.5.1),
-               python-six (>= 1.3.0),
                python3-all-dbg,
                python3-all-dev,
                python3-decorator,
                python3-nose,
                python3-numpy (>= 1:1.7.2),
-               python3-numpy-dbg,
-               python3-six
+               python3-numpy-dbg
 Build-Depends-Indep:
   python-docutils,
   python-matplotlib,
@@ -42,7 +40,6 @@
 Package: python-scipy
 Architecture: any
 Depends: python-decorator,
-         python-six (>= 1.3.0),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -63,7 +60,6 @@
 Architecture: any
 Depends: python3-decorator,
          python3-numpy (>= 1:1.7.2),
-         python3-six (>= 1.3.0),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2014-05-27 23:49:52 UTC (rev 29110)
+++ packages/scipy/trunk/debian/rules	2014-05-27 23:49:55 UTC (rev 29111)
@@ -53,10 +53,8 @@
 	find $(BASE)/ -name generate_ufuncs.py -delete
 
 	set -e && for py in $(PY2VERS); do \
-	  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/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/six.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/lib/six.py
 	ln -sf /usr/lib/python3/dist-packages/decorator.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/lib/decorator.py
 
 	# not ported to py3 in 0.10.1