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

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

    Date: Tuesday, May 28, 2013 @ 21:59:25
  Author: jtaylor-guest
Revision: 24605

use system python-six and python-decorator instead of embedded copies

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

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2013-05-28 21:59:20 UTC (rev 24604)
+++ packages/scipy/trunk/debian/changelog	2013-05-28 21:59:25 UTC (rev 24605)
@@ -21,6 +21,7 @@
     - python3.3-incdir.diff
   * Bump standard to 3.9.4, no changes required
   * drop unused sharutils build depend and python-profiler from suggests
+  * use system python-six and python-decorator instead of embedded copies
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2013-05-28 21:59:20 UTC (rev 24604)
+++ packages/scipy/trunk/debian/control	2013-05-28 21:59:25 UTC (rev 24605)
@@ -14,15 +14,19 @@
                libsuitesparse-dev (>= 3.1.0-3),
                python-all-dbg (>= 2.5.4-1~),
                python-all-dev (>= 2.6.6-3~),
+               python-decorator,
                python-mako,
                python-nose,
                python-numpy (>= 1:1.5.1),
                python-numpy-dbg (>= 1:1.5.1),
+               python-six,
                python3-all-dbg,
                python3-all-dev,
+               python3-decorator,
                python3-nose,
                python3-numpy (>= 1:1.6.2~rc1-1~),
                python3-numpy-dbg,
+               python3-six,
                swig
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.1
@@ -34,7 +38,11 @@
 
 Package: python-scipy
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Depends: python-decorator,
+         python-six,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Provides: ${python:Provides}
 Recommends: g++ | c++-compiler, python-dev, python-imaging
 Description: scientific tools for Python
@@ -50,7 +58,11 @@
 
 Package: python3-scipy
 Architecture: any
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Depends: python3-decorator,
+         python3-six,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
 Recommends: g++ | c++-compiler
 Description: scientific tools for Python 3
  SciPy supplements the popular NumPy module (python-numpy package), gathering a

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2013-05-28 21:59:20 UTC (rev 24604)
+++ packages/scipy/trunk/debian/rules	2013-05-28 21:59:25 UTC (rev 24605)
@@ -49,6 +49,13 @@
 	rm -f $(BASE)/python-scipy*/usr/lib/python*/*-packages/scipy/LICENSE.txt;
 	rm -fr $(BASE)/python-scipy*/usr/lib/python*/*-packages/scipy/weave/examples/
 
+	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
 	rm -rf $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/weave
         #call dh_numpy