[oe-commits] org.oe.dev matchbox-panel-2: solve all the madness by making it parallel installable with matchbox-panel-1

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 27aca49b911dabda3d97ad1396b7935b473f1b44
ViewMTN: http://monotone.openembedded.org/revision.psp?id=27aca49b911dabda3d97ad1396b7935b473f1b44
Files:
1
packages/matchbox2/matchbox-panel-2_svn.bb
Diffs:

#
# mt diff -rdb9dae5ea0fed1cf4868b93ef71e4f89ec6b82c0 -r27aca49b911dabda3d97ad1396b7935b473f1b44
#
# 
# 
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
#  from [fde2b3bfd152a139af50a4ccc599ce4d82f62f03]
#    to [815f1bdec4bc8bca3dee767a2c176c56df0980ae]
# 
============================================================
--- packages/matchbox2/matchbox-panel-2_svn.bb	fde2b3bfd152a139af50a4ccc599ce4d82f62f03
+++ packages/matchbox2/matchbox-panel-2_svn.bb	815f1bdec4bc8bca3dee767a2c176c56df0980ae
@@ -1,12 +1,10 @@ DEPENDS = "gtk+"
 DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
 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 @@ EXTRA_OECONF = "--disable-startup-notifi
 
 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
 }