aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-30 12:35:56 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-09 10:31:00 +0100
commit0872d60659798f89eeb7bdc94060d8961a53583d (patch)
treef845095793ad9f7b80cbf53f9abfe88ca9882ac1 /meta-efl
parent0265a98f7140cb4c43da7e19e25fef3c205c3c8f (diff)
downloadmeta-openembedded-0872d60659798f89eeb7bdc94060d8961a53583d.tar.gz
meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/efl/elsa_svn.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index 949c7e1f80..a079ec0365 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
-PR = "r3"
+PR = "r4"
PV = "0.0.4+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
@@ -34,5 +34,5 @@ RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
RCONFLICTS_${PN} += "xserver-nodm-init"
RREPLACES_${PN} += "xserver-nodm-init"
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init"
-RREPLACES_${PN}-systemd += "xserver-nodm-init"
+RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
+RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"