Avoid conflicts non-session-manager <-> new-session-manager

* split out non-session-manager into seperate package
* this can be enhanced but for now prefer new-session-manager in
  musicians-world

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-10-16 21:42:19 +02:00
parent 493ad2cf46
commit 4783474d39
2 changed files with 17 additions and 0 deletions

View File

@@ -17,3 +17,5 @@ S = "${WORKDIR}/git"
inherit meson gtk-icon-cache
RCONFLICTS_${PN} = "non-session-manager"
RREPLACES_${PN} = "non-session-manager"

View File

@@ -41,3 +41,18 @@ do_configure_prepend() {
}
FILES_${PN} += "${datadir}/non-sequencer"
PACKAGES =+ "${PN}-session-manager"
FILES_${PN}-session-manager = " \
${datadir}/applications/non-session-manager.desktop \
${datadir}/icons/hicolor/*/apps/non-session-manager.png \
${datadir}/pixmaps/non-session-manager \
${bindir}/jackpatch \
${bindir}/non-session-manager \
${bindir}/nsm-proxy \
${bindir}/nsm-proxy-gui \
${bindir}/nsmd \
"
RCONFLICTS_${PN}-session-manager = "new-session-manager"
RREPLACES_${PN}-session-manager = "new-session-manager"