[oe-commits] Otavio Salvador : xfce4-session: Add x-session-manager alternative

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 1f425a0658d475ff44c0cb291cc0cfc4fb115985
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1f425a0658d475ff44c0cb291cc0cfc4fb115985

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Sat Apr 13 17:13:48 2013 +0000

xfce4-session: Add x-session-manager alternative

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xfce4-session/xfce4-session_4.10.0.bb          |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 2c185a5..8de95ee 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
 DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r5"
+PR = "r6"
 
-inherit xfce
+inherit xfce update-alternatives
 
 SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230"
 SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce"
@@ -17,6 +17,9 @@ SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch
             file://0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch \
 "
 
+ALTERNATIVE_${PN} = "x-session-manager"
+ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session"
+
 # protect from frightening message that xfce might not work correctly
 pkg_postinst_${PN} () {
     echo 127.0.0.1    ${MACHINE} >> /etc/hosts