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 <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 8275a1be713da15a9e74357e9781cbf144092353..74be30f91a49939e993928015169508a501d5c49 100644 (file)
--- 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 00720fd88f28600ad8fb75b870ce650889328ee5..1c8aeaa5cc5737f1037d7820532e0af76f0a0d68 100644 (file)
--- 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"