[oe-commits] org.oe.dev gtk+-directfb: r1: Add gtk+ to conflicts list

[svolpe commit]

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

Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: ff7e7d4bb2ece720e10b5eaaf5077d02989f8246
ViewMTN: http://monotone.openembedded.org/revision/info/ff7e7d4bb2ece720e10b5eaaf5077d02989f8246
Files:
1
packages/gtk+/gtk+-directfb_2.10.14.bb
Diffs:

#
# mt diff -r8cab20c14fd2e521e04d0f06c4802f4d9cd4832f -rff7e7d4bb2ece720e10b5eaaf5077d02989f8246
#
# 
# 
# patch "packages/gtk+/gtk+-directfb_2.10.14.bb"
#  from [ea7944caf9f65db3a35b019ca4438d2ef4684262]
#    to [e1dcebc66728226c67f37666fb11d9e55d172621]
# 
============================================================
--- packages/gtk+/gtk+-directfb_2.10.14.bb	ea7944caf9f65db3a35b019ca4438d2ef4684262
+++ packages/gtk+/gtk+-directfb_2.10.14.bb	e1dcebc66728226c67f37666fb11d9e55d172621
@@ -1,12 +1,13 @@ require gtk-2.10.inc
 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"