diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
| commit | f2c65a6c54c402e013a7264aa433844be864455a (patch) | |
| tree | 8d8e63352abf1f9996ce40a4455444ad1d26220c | |
| parent | e90cf71fe69917d5716fbf25846ba0e91f0b5bd7 (diff) | |
| parent | 81adc0e1ce121a1cb04ea484761920e6e79c6f25 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
121 files changed, 1495 insertions, 431 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 704cfb2879..e613f53fae 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -44,6 +44,7 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" PREFERRED_VERSION_python = "2.6.4" +PREFERRED_VERSION_python-pycairo = "1.8.0" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fe54232020..c7b8f64d40 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "538" -EFL_SRCREV ?= "49824" +EFL_SRCREV ?= "49934" diff --git a/recipes/devicekit/devicekit-power_009.bb b/recipes/devicekit/devicekit-power_009.bb index 01f0aedf8d..099ce0b2e3 100644 --- a/recipes/devicekit/devicekit-power_009.bb +++ b/recipes/devicekit/devicekit-power_009.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Devicekit power" LICENSE = "GPLv2" DEPENDS = "devicekit glib-2.0 dbus-glib policykit" -SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz" +SRC_URI = "http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/snapshot/DeviceKit-power-${PV}.tar.gz" S = "${WORKDIR}/DeviceKit-power-${PV}" inherit autotools pkgconfig @@ -18,7 +18,5 @@ FILES_${PN} += "${datadir}/dbus-1/ \ FILES_${PN}-dbg += "${base_libdir}/udev/.debug" - - -SRC_URI[md5sum] = "535703fa7b9c323d6388b5aff28cfeeb" -SRC_URI[sha256sum] = "438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55" +SRC_URI[md5sum] = "2ec93fbd14926101a12c9e4dbbe5937f" +SRC_URI[sha256sum] = "6dfa2623cb5c0b2df9aff00ad6d3213815d7de498855cc6f72c2cd18d50a4cd1" diff --git a/recipes/devicekit/devicekit-power_014.bb b/recipes/devicekit/devicekit-power_014.bb index acdcd9a9ce..f018a64aab 100644 --- a/recipes/devicekit/devicekit-power_014.bb +++ b/recipes/devicekit/devicekit-power_014.bb |