merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'

     and '422bef8b6a966bcd08d148e2c1a9a03bf1217087'

diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index d39e9a4..4eb843f 100644 (file)
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,12 +1,10 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml15"
+PR = "ml17"
 
 RDEPENDS = "\
                python-ao               \
-               python-pybluez          \
-               python-cairo            \
                python-cheetah          \
                python-constraint       \
                python-crypto           \
@@ -40,6 +38,7 @@ RDEPENDS = "\
                python-ogg              \
                python-pexpect          \
                python-pybluez          \
+               python-pycairo          \
                python-pychecker        \
                python-pycodes          \
                python-pyephem          \
@@ -54,6 +53,7 @@ RDEPENDS = "\
                python-pyiw             \
                python-pylinda          \
                python-pylint           \
+               python-pyode            \
                python-pyraf            \
                python-pyreverse        \
                python-pyrex            \