[oe-commits] Martin Jansa : gnome-panel3: exclude from world

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 048b1ea461c2d116b7e31161bae0dee1f9e06a7e
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=048b1ea461c2d116b7e31161bae0dee1f9e06a7e

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jan 28 13:17:21 2013 +0100

gnome-panel3: exclude from world

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../gnome-panel/gnome-panel3_3.0.2.bb              |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index bd21ca1..3aadd2b 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
 BPN = "gnome-panel"
 PR = "r1"
 
+# conflicts with gnome-panel, because they provide the same package
+# http://patches.openembedded.org/patch/43105/
+EXCLUDE_FROM_WORLD = "1"
 DEFAULT_PREFERENCE = "-1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \