From 7e87614466c33fd41fa2372b93993a726efbb55b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 26 Jun 2010 02:11:45 +0000 Subject: [PATCH] matchbox-keyboard*: drop RPROVIDES * RCONFLICTS is enough to block packages providing conflicting files * distributions can still decide if they need only some or all 3 parts of matchbox-keyboard-inputmethod or if matchbox-keyboard (like matchbox-keyboard-inputmethod package but without Xsession script) is enough Signed-off-by: Martin Jansa --- recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 3 +-- recipes/matchbox-keyboard/matchbox-keyboard_svn.bb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index bbe887476d..f8822e7e03 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" -RPROVIDES_${PN} = "matchbox-keyboard" SECTION = "x11" SRCREV = "1910" PV = "0.0+svnr${SRCPV}" -PR = "r11" +PR = "r12" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ file://smallscreen-fontsize.patch \ diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb index 28e3ac7e3b..28d8035ca6 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" RCONFLICTS_${PN} = matchbox-keyboard-inputmethod -RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" SRCREV = "1910" PV = "0.0+svnr${SRCPV}" -PR = "r8" +PR = "r9" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch \ -- 2.39.5