[oe-commits] org.oe.dev merge of '7c9631167173e3ba316bc3efd67dece0804859a7'

[mickeyl commit]

merge of '7c9631167173e3ba316bc3efd67dece0804859a7'
     and '8ae2f68097943e0d2ab4479bb2e0e0a568de60fd'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 31473cedcc35446ce4e2e72c3e215e70dba7d2b4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=31473cedcc35446ce4e2e72c3e215e70dba7d2b4
Files:
1
packages/clamav/clamav_0.91.1.bb
packages/tasks/task-python-everything.bb
Diffs:

#
# mt diff -r7c9631167173e3ba316bc3efd67dece0804859a7 -r31473cedcc35446ce4e2e72c3e215e70dba7d2b4
#
# 
# 
# patch "packages/clamav/clamav_0.91.1.bb"
#  from [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
#    to [8b79a2eecd9cb5b4ec025d27710997610b1ac8c9]
# 
============================================================
--- packages/clamav/clamav_0.91.1.bb	7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb	8b79a2eecd9cb5b4ec025d27710997610b1ac8c9
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 require clamav.inc
 
 PR = "r0"


#
# mt diff -r8ae2f68097943e0d2ab4479bb2e0e0a568de60fd -r31473cedcc35446ce4e2e72c3e215e70dba7d2b4
#
# 
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3e98f2dd27cca9f4768b4faf85221eb01df5b725]
#    to [3da11e0123ff22657bf159c34f7cc113db67db51]
# 
============================================================
--- packages/tasks/task-python-everything.bb	3e98f2dd27cca9f4768b4faf85221eb01df5b725
+++ packages/tasks/task-python-everything.bb	3da11e0123ff22657bf159c34f7cc113db67db51
@@ -1,12 +1,10 @@ LICENSE = "MIT"
 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		\