From: Koen Kooi <koen@openembedded.org>
Date: Mon, 2 Apr 2007 06:22:46 +0000 (+0000)
Subject: matchbox-panel-2: solve all the madness by making it parallel installable with matchb... 
X-Git-Tag: Release-2010-05/1~8868^2~861^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdb8fa1b9180443a7d9a78f6229e565f502fee35;p=openembedded.git

matchbox-panel-2: solve all the madness by making it parallel installable with matchbox-panel-1
---

diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index d166e78a3a..be2e7f39cf 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -3,10 +3,8 @@ LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+"
 
-RCONFLICTS_${PN} = "matchbox-panel"
-
 PV = "0.1+svn${SRCDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
@@ -15,6 +13,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-startup-notification --disable-libnotify"
 
+# matchbox-<anything>-2 aims to replace their -1 counterpart, but at this point in time it's unfinished and unusable,  so make it parallel installable
+do_install_append() {
+    mv ${D}${bindir}/matchbox-panel ${D}${bindir}/matchbox-panel-2
+}
+
 do_stage() {
     autotools_stage_all
 }