[oe-commits] org.oe.dev merge of '1f570b878b7faa73a50263f281ff2bad89d0e78b'

[mickeyl commit]

merge of '1f570b878b7faa73a50263f281ff2bad89d0e78b'
     and 'be55d0d4fe08efd2bd552157f130e03ccd5ac65a'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3601dddeaadc9f1eec11df4baadff513d463bbe4
ViewMTN: http://monotone.openembedded.org/revision/info/3601dddeaadc9f1eec11df4baadff513d463bbe4
Files:
1
packages/python/python-sqlalchemy_0.4.2p3.bb
packages/tasks/task-python-everything.bb
packages/python/python-pyqt_4.3.3.bb
Diffs:

#
# mt diff -r1f570b878b7faa73a50263f281ff2bad89d0e78b -r3601dddeaadc9f1eec11df4baadff513d463bbe4
#
# 
# 
# patch "packages/python/python-sqlalchemy_0.4.2p3.bb"
#  from [f9f043d233c8911a1e613cc8d058fd3cd2206b2f]
#    to [18b9298c36a2fa274dc84c3eee646683bf772e85]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [4205f773c7e409cd6521c0a3a73c501e4c6a15bc]
#    to [b5a200a4072ebca5bb229f749f96085c3914b4e5]
# 
============================================================
--- packages/python/python-sqlalchemy_0.4.2p3.bb	f9f043d233c8911a1e613cc8d058fd3cd2206b2f
+++ packages/python/python-sqlalchemy_0.4.2p3.bb	18b9298c36a2fa274dc84c3eee646683bf772e85
@@ -1,14 +1,12 @@ LICENSE = "MIT"          
 DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL"
 HOMEPAGE = "http://www.sqlalchemy.org/"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"          
-DEPENDS = "python-setuptools"
-#RDEPENDS = ""
-SRCNAME = "sqlalchemy"
+SRCNAME = "SQLAlchemy"
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/SQLAlchemy-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+inherit setuptools
-#inherit distutils
============================================================
--- packages/tasks/task-python-everything.bb	4205f773c7e409cd6521c0a3a73c501e4c6a15bc
+++ packages/tasks/task-python-everything.bb	b5a200a4072ebca5bb229f749f96085c3914b4e5
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml25"
+PR = "ml26"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -75,6 +75,7 @@ RDEPENDS = "\
 		python-soappy		\
 		python-spydi		\
 		python-spyro		\
+		python-sqlalchemy	\
 		python-sqlobject	\
 		python-sword		\
 		python-tlslite		\


#
# mt diff -rbe55d0d4fe08efd2bd552157f130e03ccd5ac65a -r3601dddeaadc9f1eec11df4baadff513d463bbe4
#
# 
# 
# patch "packages/python/python-pyqt_4.3.3.bb"
#  from [223ab1067352bfd8f64a2ce301d5cc0b02dcce43]
#    to [3576e364ba5d18127b6acf06fa14a929527c5fa8]
# 
============================================================
--- packages/python/python-pyqt_4.3.3.bb	223ab1067352bfd8f64a2ce301d5cc0b02dcce43
+++ packages/python/python-pyqt_4.3.3.bb	3576e364ba5d18127b6acf06fa14a929527c5fa8
@@ -1,9 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "Python Qt4 Bindings"
 HOMEPAGE = "http://riverbankcomputing.co.uk"
 AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "sip-native python-sip"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
 PR = "ml1"