aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-16 20:08:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:18:40 +0100
commitfbcda6eff010e0a39cc0145a514e7de99f475145 (patch)
treea64d1731bd75f4f5951ec43ba73c4870ee896faa /meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
parentabd5d5a712686a379a1a1da29d78a0f374f13e33 (diff)
downloadopenembedded-core-contrib-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.gz
recipes: replace CONFLICTS with RCONFLICTS_${PN}
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb')
-rw-r--r--meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
index 92c37c6f62..08b610aea5 100644
--- a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
@@ -9,9 +9,9 @@ see and monitor X resource usage of various clients."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
-CONFLICTS = "resourceext"
+RCONFLICTS_${PN} = "resourceext"
-PR = "r0"
+PR = "r1"
PE = "1"
SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"