[oe-commits] Vitus Jensen : socketcan-utils-test: rconflicts with canutils

[git version control]

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

Author: Vitus Jensen <vjensen at gmx.de>
Date:   Fri May 21 04:38:06 2010 +0000

socketcan-utils-test: rconflicts with canutils

Rconflicts because of identical program names.

Signed-off-by: Vitus Jensen <vjensen at gmx.de>
Signed-off-by: Eric Bénard <eric at eukrea.com>

---

 recipes/socketcan/socketcan-utils-test_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/recipes/socketcan/socketcan-utils-test_svn.bb b/recipes/socketcan/socketcan-utils-test_svn.bb
index e04c3c2..2239a02 100644
--- a/recipes/socketcan/socketcan-utils-test_svn.bb
+++ b/recipes/socketcan/socketcan-utils-test_svn.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Socketcan user space utilities and test apps"
 HOMEPAGE = "http://developer.berlios.de/projects/socketcan/"
 SECTION = "console/utils"
 LICENSE = "GPL"
+RCONFLICTS = "canutils"
 
 SRCREV = "917"
 PV = "0.0+svnr${SRCPV}"