[oe-commits] Otavio Salvador : meta-efl: elsa: rconflicts/ rreplaces xserver-nodm-init-systemd
git at git.openembedded.org
git at git.openembedded.org
Mon Jan 9 09:41:10 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 0872d60659798f89eeb7bdc94060d8961a53583d
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=0872d60659798f89eeb7bdc94060d8961a53583d
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Fri Dec 30 12:35:56 2011 +0000
meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
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"
More information about the Openembedded-commits
mailing list