From 8efe56776f2fc75a91990b07d10aecbcc8b88528 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 18 Jan 2019 15:58:09 +0100
Subject: [PATCH] [wip/pal-gazebo-plugins] add conflicts with an older package

---
 pal-gazebo-plugins/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pal-gazebo-plugins/Makefile b/pal-gazebo-plugins/Makefile
index 50ee81a4..61804169 100644
--- a/pal-gazebo-plugins/Makefile
+++ b/pal-gazebo-plugins/Makefile
@@ -15,6 +15,8 @@ MASTER_SITES=	${HOMEPAGE}/archive/
 COMMENT=	Common Gazebo v1.9+ plugins used by the PAL Robotics robots
 LICENSE=	2-clause-bsd
 
+CONFLICTS+=	talos-${PKGBASE}
+
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 include ../../devel/ros-catkin/depend.mk
@@ -32,4 +34,3 @@ include ../../wip/pal-msgs/depend.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk
-
-- 
GitLab