summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/matchbox2/matchbox-panel-2_svn.bb9
1 files changed, 6 insertions, 3 deletions
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
}