diff options
| author | Phil Blundell <philb@gnu.org> | 2008-08-01 19:42:12 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-08-01 19:42:12 +0000 |
| commit | d91644f23743d5bb330ab64634b9f785982da377 (patch) | |
| tree | 5aa8cc6a9043329b0413f8b7b3dc485c0a9fab1e | |
| parent | 9f60719726356657d559aa1e045c9ae126f13e32 (diff) | |
| parent | e2bf1be715145512644049402e4e94083c938445 (diff) | |
merge of 'a061abf4bdeedaccdb10ef3b7372827d261db509'
and 'c6e91bf295f3be4e74e18520fdbb8aeb20908d3e'
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 3 | ||||
| -rw-r--r-- | packages/python/python-dbus_0.83.0.bb (renamed from packages/python/python-dbus_0.82.4.bb) | 2 | ||||
| -rw-r--r-- | packages/python/python-evas_cvs.bb | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a936259fe6..c3e4b41b97 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1506,7 +1506,7 @@ PREFERRED_VERSION_python24-sip ?= "4.1.1" PREFERRED_VERSION_python ?= "2.5.2" PREFERRED_VERSION_python-ao ?= "0.82" PREFERRED_VERSION_python-constraint ?= "1.1" -PREFERRED_VERSION_python-dbus ?= "0.82.4" +PREFERRED_VERSION_python-dbus ?= "0.83.0" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 040c483c76..c3a373527f 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.2+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d @@ -31,6 +31,7 @@ RDEPENDS_${PN} += "\ python-pyserial \ python-pyyaml \ python-shell \ + python-subprocess \ python-syslog \ \ ${PN}-config \ diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.83.0.bb index 6940adf223..4ccecc0aa1 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.83.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" -PR = "ml4" +PR = "ml0" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index 57e28b28ed..92f4466a24 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -3,10 +3,6 @@ DEPENDS += "evas" PV = "0.2.1+cvs${SRCDATE}" PR = "r0" -do_compile_prepend() { - touch include/evas/__init__.py -} - do_stage() { distutils_stage_all } |