[oe-commits] Martin Jansa : matchbox-keyboard*: drop RPROVIDES

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7e87614466c33fd41fa2372b93993a726efbb55b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7e87614466c33fd41fa2372b93993a726efbb55b

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Jun 26 02:11:45 2010 +0000

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 <Martin.Jansa at gmail.com>

---

 .../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 bbe8874..f8822e7 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 28e3ac7..28d8035 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 \