From 4b194d3709430a75390b0a6f38fb487a6f63deff Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Tue, 5 Jun 2018 11:32:24 +0200
Subject: [PATCH] [wip/prf-ros-control] Add conflicts with standard ros-control
---
prf-ros-control/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/prf-ros-control/Makefile b/prf-ros-control/Makefile
index 2464488e..78348281 100644
--- a/prf-ros-control/Makefile
+++ b/prf-ros-control/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wip
#MASTER_SITES= ${MASTER_SITE_JRL:=talos/talos_ros_control/}
@@ -20,6 +20,8 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= ros_control package with torque sensors
LICENSE= 2-clause-bsd
+CONFLICTS+= ros-control-[0-9]*
+
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
--
GitLab