From eef8f869dd908e4dbca68b7a20e017c4ee40d626 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 26 May 2011 21:39:32 +0200 Subject: dbus: clean up dbus-x11 packaging Martin Jansa spotted some differences with OE dev, which this commit fixes: * dbus-launch is mentioned twice in FILES * dbus-x11 should drag in dbus-1 Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 2 +- meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 8275a1be7..74be30f91 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -24,12 +24,12 @@ DEBIANNAME_${PN} = "dbus-1" PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd" FILES_${PN}-x11 = "${bindir}/dbus-launch" +RDEPENDS_${PN}-x11 "${PN}" FILES_${PN}-systemd = "${base_libdir}/systemd/system/" FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-uuidgen \ - ${bindir}/dbus-launch \ ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb index 00720fd88..1c8aeaa5c 100644 --- a/meta/recipes-core/dbus/dbus_1.4.1.bb +++ b/meta/recipes-core/dbus/dbus_1.4.1.bb @@ -1,6 +1,6 @@ include dbus.inc -PR = "r3" +PR = "r4" SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" -- cgit v1.2.3