From: Shane Volpe <shanevolpe@gmail.com>
Date: Mon, 24 Sep 2007 13:04:42 +0000 (+0000)
Subject: cairo-directfb: r1: Added RCONFLICTS for cairo
X-Git-Tag: Release-2010-05/1~8611^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e45202c10dd84b4cdceed976024d2b036f176b75;p=openembedded.git

cairo-directfb: r1: Added RCONFLICTS for cairo
---

diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index d3f6509151..0a2090cf66 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -1,5 +1,5 @@
 require cairo.inc
-
+RCONFLICTS = "cairo"
 DEPENDS = "directfb libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +12,6 @@ EXTRA_OECONF += " --enable-directfb \
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/cairo-${PV}"