[PATCHv3] dbus: clean up dbus-x11 packaging

[PATCHv3] dbus: clean up dbus-x11 packaging

[Koen Kooi]

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>
---

Try 3, now with git --amend working properly. With a special thanks to Martin who tells me about these stupid typos on IRC

 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 8275a1b..2a5f8bd 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 00720fd..1c8aeaa 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"
-- 
1.6.6.1

Re: [PATCHv3] dbus: clean up dbus-x11 packaging

[Richard Purdie]

On Thu, 2011-05-26 at 21:45 +0200, Koen Kooi wrote:
> 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>
> ---
> 
> Try 3, now with git --amend working properly. With a special thanks to Martin who tells me about these stupid typos on IRC
> 
>  meta/recipes-core/dbus/dbus.inc      |    2 +-
>  meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks (although I screwed up merging the right patch
too).

Cheers,

Richard