summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-26 21:39:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-27 00:03:11 +0100
commiteef8f869dd908e4dbca68b7a20e017c4ee40d626 (patch)
treeeae3ea4e2e0308789b014696ecb75c703958c552
parent9281ac4c98d4287a5492f13f94e1bd0eea4791c6 (diff)
downloadopenembedded-core-eef8f869dd908e4dbca68b7a20e017c4ee40d626.tar.gz
openembedded-core-eef8f869dd908e4dbca68b7a20e017c4ee40d626.tar.bz2
openembedded-core-eef8f869dd908e4dbca68b7a20e017c4ee40d626.tar.xz
openembedded-core-eef8f869dd908e4dbca68b7a20e017c4ee40d626.zip
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>
-rw-r--r--meta/recipes-core/dbus/dbus.inc2
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb2
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"