From 0e8f0f0a033c79611a15914fde5826876502af2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Dec 2010 20:23:33 +0100 Subject: RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN} For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN} Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-sato/eds/eds-tools_bzr.bb | 4 ++-- meta/recipes-sato/gaku/gaku_svn.bb | 6 +++--- meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb | 3 ++- meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb | 4 ++-- meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | 4 ++-- meta/recipes-sato/owl-video-widget/libowl-av_svn.bb | 6 +++--- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/contacts_0.9.bb | 2 +- meta/recipes-sato/pimlico/contacts_git.bb | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-sato/pimlico/dates_0.4.8.bb | 2 +- meta/recipes-sato/pimlico/dates_git.bb | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/eds/eds-tools_bzr.bb b/meta/recipes-sato/eds/eds-tools_bzr.bb index 0dfcf593c0..9cead16516 100644 --- a/meta/recipes-sato/eds/eds-tools_bzr.bb +++ b/meta/recipes-sato/eds/eds-tools_bzr.bb @@ -1,10 +1,10 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "dbus-glib eds-dbus" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" DESCRIPTION = "Test applications for EDS" -PR = "r0" +PR = "r1" SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http" diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb index a70863e6bc..d1e2a3f43f 100644 --- a/meta/recipes-sato/gaku/gaku_svn.bb +++ b/meta/recipes-sato/gaku/gaku_svn.bb @@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" DEPENDS = "gtk+ gstreamer libowl-av" -RDEPENDS = "gst-plugins-base-audioconvert \ +RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ gst-plugins-base-audioresample \ gst-plugins-base-typefindfunctions \ gst-plugins-base-playbin" -RRECOMMENDS = "gst-plugins-good-id3demux \ +RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ gst-plugins-base-vorbis \ gst-plugins-base-alsa \ gst-plugins-base-ogg \ @@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \ PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http" diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb index af748f14ff..88484eb12b 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" DEPENDS = "gconf gtk+" -RDEPENDS = "settings-daemon" +RDEPENDS_${PN} = "settings-daemon" PV = "0.0+svnr${SRCREV}" +PR = "r1" S = "${WORKDIR}/${PN}" diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb index 337738edf8..935136d6fb 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -RDEPENDS = "formfactor dbus-wait" +RDEPENDS_${PN} = "formfactor dbus-wait" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fix.patch;patch=1;maxrev=1819 \ diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 96d644c3c9..a4abea4b8b 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -6,8 +6,8 @@ LICENSE = "GPL" LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" SECTION = "x11" -RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" +RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" +PR = "r28" # This package is architecture specific because the session script is modified # based on the machine architecture. diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb index 4eeeed6d24..15bd37ac8c 100644 --- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ SECTION = "x11" DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS = "gst-meta-base" -RRECOMMENDS = "gst-meta-audio gst-meta-video" +RDEPENDS_${PN} = "gst-meta-base" +RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/${PN}" diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc index a424295aca..ce990d7ddd 100644 --- a/meta/recipes-sato/pimlico/contacts.inc +++ b/meta/recipes-sato/pimlico/contacts.inc @@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb index 1e4628737d..a9e3f15ad1 100644 --- a/meta/recipes-sato/pimlico/contacts_0.9.bb +++ b/meta/recipes-sato/pimlico/contacts_0.9.bb @@ -1,5 +1,5 @@ require contacts.inc -PR = "r2" +PR = "r3" SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz" diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb index c375435309..0d2e235e56 100644 --- a/meta/recipes-sato/pimlico/contacts_git.bb +++ b/meta/recipes-sato/pimlico/contacts_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc index 6ef7b60611..01ab409625 100644 --- a/meta/recipes-sato/pimlico/dates.inc +++ b/meta/recipes-sato/pimlico/dates.inc @@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -RDEPENDS = "libedata-cal" +RDEPENDS_${PN} = "libedata-cal" inherit autotools pkgconfig gtk-icon-cache diff --git a/meta/recipes-sato/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb index 13afc157d0..ca88a7301e 100644 --- a/meta/recipes-sato/pimlico/dates_0.4.8.bb +++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r3" +PR = "r4" SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz" diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb index d09f4e6216..bceeec671e 100644 --- a/meta/recipes-sato/pimlico/dates_git.bb +++ b/meta/recipes-sato/pimlico/dates_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" PV = "0.4.11+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git" -- cgit 1.2.3-korg