From: Shane Volpe <shanevolpe@gmail.com>
Date: Mon, 24 Sep 2007 21:26:45 +0000 (+0000)
Subject: gtk+-directfb: r1: Add gtk+ to conflicts list
X-Git-Tag: Release-2010-05/1~8607^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1b387f6444dedfcb2a1a306fa088752b608cff;p=openembedded.git

gtk+-directfb: r1: Add gtk+ to conflicts list
---

diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
index d661e20433..9a855d078d 100644
--- a/packages/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,12 +1,13 @@
 require gtk-2.10.inc
 
-PR = "r0"
+PR = "r1"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
 S = "${WORKDIR}/gtk+-${PV}"
 
 
+RCONFLICTS = "gtk+"
 DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups"
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"