From d5819c52ac5c3c8b6dec3f4c6baf86c2a4ef9f2e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 26 Jul 2013 19:36:53 +0200 Subject: Convert to new ALTERNATIVE_${PN} syntax --- recipes-lxde/lxde-common/lxde-common_0.5.5.bb | 11 ++++++----- recipes-lxde/openbox/openbox_3.5.0.bb | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb index 7cb5fad..d75da33 100644 --- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb +++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb @@ -5,6 +5,8 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=597980c597fe9ce16d7b6b19c44cfced" +PR = "r1" + RDEPENDS_{PN} = "gtk+ lxde-icon-theme" DEPENDS = "${RDEPENDS}" @@ -17,8 +19,7 @@ inherit autotools pkgconfig update-alternatives FILES_${PN} += "${datadir}/lxde/ ${datadir}/lxpanel ${datadir}/xsessions" -ALTERNATIVE_PATH = "${bindir}/startlxde" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "15" - +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/startlxde" +ALTERNATIVE_PRIORITY[x-window-manager] = "15" diff --git a/recipes-lxde/openbox/openbox_3.5.0.bb b/recipes-lxde/openbox/openbox_3.5.0.bb index fc016a4..286361d 100644 --- a/recipes-lxde/openbox/openbox_3.5.0.bb +++ b/recipes-lxde/openbox/openbox_3.5.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r4" +PR = "r5" RDEPENDS_{PN} = "glib-2.0 libxml2 pango imlib2 startup-notification libxft libxrandr libxt" DEPENDS = "${RDEPENDS} xextproto xf86vidmodeproto" @@ -22,10 +22,10 @@ EXTRA_OECONF += "\ --with-x\ " -ALTERNATIVE_PATH = "${bindir}/openbox" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "10" +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" +ALTERNATIVE_PRIORITY[x-window-manager] = "10" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dbg ${PN}-kde ${PN}-kde-dbg" FILES_${PN} += "${datadir}/gnome ${datadir}/xsessions" -- cgit v1.2.3