summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-01 18:48:27 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-01 18:48:27 +0000
commit81109d7d1da88e2ceab774868eedfb6d884a8b18 (patch)
treed19957dcd663f8ddb8e8dc323d9b5d718adb509e
parent5978dd6185ced3c9140640792ada10e9e9251419 (diff)
parentf07286e9a9effd66435f9541a526348ef5605db0 (diff)
merge of '03e37205ddb308324f3e7b1e882c50510b125716'
and '9ed8a9e4b331c4c26542be80abb9775edaf8f5bf'
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-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.bb4
3 files changed, 2 insertions, 6 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/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
}