From patchwork Fri Dec 30 16:40:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-oe, v3, 2/3] meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd Date: Fri, 30 Dec 2011 16:40:12 -0000 From: Otavio Salvador X-Patchwork-Id: 17899 Message-Id: To: openembedded-devel@lists.openembedded.org Signed-off-by: Otavio Salvador --- meta-efl/recipes-efl/efl/elsa_svn.bb | 6 +++--- 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 949c7e1..a079ec0 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"