[Blends-commit] [SCM] science branch, master, updated. 493d0bb81637bceb05b1fca95b15eff0baadf059

[Andreas Tille]

The following commit has been merged in the master branch:
commit 493d0bb81637bceb05b1fca95b15eff0baadf059
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 14 10:17:49 2016 +0200

    Always prefer python3 version

diff --git a/tasks/engineering-dev b/tasks/engineering-dev
index aa8e68e..98c1719 100644
--- a/tasks/engineering-dev
+++ b/tasks/engineering-dev
@@ -77,7 +77,7 @@ Depends: libnfft3-dev
 
 Depends: libnlopt-dev
 
-Depends: python-fftw3 | python3-fftw3 
+Depends: python3-fftw3 | python-fftw3 
 
 Depends: libcoin80-dev
 
@@ -95,7 +95,7 @@ Depends: libdime-dev, libdxflib-dev
 
 Depends: salome-kernel-dev
 
-Depends: python-pynfft | python3-pynfft
+Depends: python3-pynfft | python-pynfft
 
 Depends: libplb-dev
 
diff --git a/tasks/linguistics b/tasks/linguistics
index e11debc..6651fba 100644
--- a/tasks/linguistics
+++ b/tasks/linguistics
@@ -53,7 +53,7 @@ Pkg-Description: SQL version of WordNet 3.0
 
 Depends: travatar
 
-Suggests: python-nltk, python3-nltk
+Suggests: python3-nltk | python-nltk
 
 Suggests: apertium-af-nl,
           apertium-apy,
diff --git a/tasks/mathematics-dev b/tasks/mathematics-dev
index 76204b1..ba67fe0 100644
--- a/tasks/mathematics-dev
+++ b/tasks/mathematics-dev
@@ -17,7 +17,7 @@ Why: non-free
 
 Depends: python-numpy
 
-Depends: python-numexpr | python3-numexpr
+Depends: python3-numexpr | python-numexpr
 
 Depends: libgsl0-dev
 
@@ -154,7 +154,7 @@ Depends: gap-dev
 
 Depends: libnfft3-dev
 
-Depends: python-fftw3 | python3-fftw3
+Depends: python3-fftw3 | python-fftw3
 
 Depends: libfftw3-dev, fftw-dev, sfftw-dev
 
@@ -170,7 +170,7 @@ Depends: libalglib-dev
 
 Depends: libeigen3-dev
 
-Depends: libviennacl-dev, python-pyviennacl, python3-pyviennacl
+Depends: libviennacl-dev, python3-pyviennacl | python-pyviennacl
 
 Depends: libgnuplot-iostream-dev
 
@@ -185,7 +185,7 @@ Why: gap-float dependencies
 
 Depends: libscscp1-dev
 
-Depends: python-linop | python3-linop
+Depends: python3-linop | python-linop
 
 Depends: libcminpack-dev, minpack-dev
 
@@ -207,11 +207,11 @@ Depends: libdouble-conversion-dev
 
 Depends: libfeel++-dev
 
-Depends: python-pynfft | python3-pynfft
+Depends: python3-pynfft | python-pynfft
 
 Depends: libug-dev
 
-Depends: python-pyoperators | python3-pyoperators
+Depends: python3-pyoperators | python-pyoperators
 
 Depends: libplb-dev
 
@@ -221,8 +221,8 @@ Depends: libfrobby-dev
 
 Depends: libmathic-dev
 
-Depends: python-dtcwt | python3-dtcwt
+Depends: python3-dtcwt | python-dtcwt
 
 Suggests: jsurf-alggeo
 
-Depends: python-pyfftw | python3-pyfftw
+Depends: python3-pyfftw | python-pyfftw
diff --git a/tasks/nanoscale-physics b/tasks/nanoscale-physics
index 5ba1339..f81e744 100644
--- a/tasks/nanoscale-physics
+++ b/tasks/nanoscale-physics
@@ -96,7 +96,7 @@ Depends: qtoctave, scilab, scilab-sivp
 
 Depends: cbflib-bin
 
-Depends: python-lmfit | python3-lmfit
+Depends: python3-lmfit | python-lmfit
 
 Suggests: science-statistics, science-mathematics
 
diff --git a/tasks/numericalcomputation b/tasks/numericalcomputation
index b9bbf32..d442b1e 100644
--- a/tasks/numericalcomputation
+++ b/tasks/numericalcomputation
@@ -51,9 +51,9 @@ Depends: python-scitools
 
 Depends: python-deap
 
-Depends: python-lmfit | python3-lmfit
+Depends: python3-lmfit | python-lmfit
 
-Depends: python-tables | python3-tables
+Depends: python3-tables | python-tables
 
 Depends: vitables
 
@@ -121,7 +121,7 @@ Depends: calculix-ccx
 
 Depends: python-sfepy
 
-Depends: python-bitstring | python3-bitstring
+Depends: python3-bitstring | python-bitstring
 
 Depends: easea
 WNPP: 783015
@@ -149,8 +149,8 @@ Depends: qsopt-ex, libqsopt-ex-dev
 
 Depends: libarrayfire-unified-dev
 
-Depends: python-arrayfire | python3-arrayfire
-
 Depends: pyzo
 
 Depends: gnudatalanguage
+
+Depends: python3-arrayfire | python-arrayfire
diff --git a/tasks/physics-dev b/tasks/physics-dev
index 50a3055..548f143 100644
--- a/tasks/physics-dev
+++ b/tasks/physics-dev
@@ -12,7 +12,7 @@ Depends: pyfai
 
 Depends: libnfft3-dev
 
-Depends: python-fftw3 | python3-fftw3
+Depends: python3-fftw3 | python-fftw3
 
 Depends: libfftw3-dev, fftw-dev, sfftw-dev
 
@@ -23,9 +23,9 @@ Comment: Source triangle seems to be unmaintained - it might make sense to team-
 
 Depends: python-quantities
 
-Depends: python-multipletau | python3-multipletau
+Depends: python3-multipletau | python-multipletau
 
-Depends: python-pynfft | python3-pynfft
+Depends: python3-pynfft | python-pynfft
 
 Depends: libfeel++-dev
 
@@ -35,4 +35,4 @@ Depends: libplb-dev
 
 Depends: libasl-dev
 
-Depends: python-pyfftw | python3-pyfftw
+Depends: python3-pyfftw | python-pyfftw
diff --git a/tasks/tools b/tasks/tools
index 76f2c1c..d99ef0b 100644
--- a/tasks/tools
+++ b/tasks/tools
@@ -15,9 +15,9 @@ Depends: xoscope
 
 Suggests: libmemtailor-dev
 
-Depends: python-h5py | python3-h5py
+Depends: python3-h5py | python-h5py
 
-Depends: python-hdf5storage | python3-hdf5storage
+Depends: python3-hdf5storage | python-hdf5storage
 
 Depends: science-workflow
 
diff --git a/tasks/viewing b/tasks/viewing
index c22281a..353a83d 100644
--- a/tasks/viewing
+++ b/tasks/viewing
@@ -141,5 +141,3 @@ Depends: trend
 Depends: python-pyqtgraph
 WNPP: 753590
 
-Depends: python-matplotlib-venn | python3-matplotlib-venn
-
diff --git a/tasks/viewing-dev b/tasks/viewing-dev
index 26a4756..6cff3fe 100644
--- a/tasks/viewing-dev
+++ b/tasks/viewing-dev
@@ -43,4 +43,6 @@ Depends: libchealpix-dev
 
 Depends: python3-skimage, python3-skimage-lib
 
+Depends: python3-matplotlib-venn | python-matplotlib-venn
+
 Depends: libplplot-dev, python-plplot-qt

-- 
Debian Science Blend