From ed97e68ae934c377d3b2a1a4c40337f8440f3f1b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 18 Feb 2020 11:34:10 +0100
Subject: [PATCH] [wip/prf-gazebo-ros-pkgs{,-melodic}] fix CONFLICTS
---
prf-gazebo-ros-pkgs-melodic/Makefile | 4 ++--
prf-gazebo-ros-pkgs/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/prf-gazebo-ros-pkgs-melodic/Makefile b/prf-gazebo-ros-pkgs-melodic/Makefile
index 591fbd98..64c8e4d0 100644
--- a/prf-gazebo-ros-pkgs-melodic/Makefile
+++ b/prf-gazebo-ros-pkgs-melodic/Makefile
@@ -23,8 +23,8 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd
-CONFLICTS+= gazebo-ros-control-[0-9]*
-CONFLICTS+= prf-gazebo-ros-control-[0-9]*
+CONFLICTS+= gazebo-ros-pkgs-[0-9]*
+CONFLICTS+= prf-gazebo-ros-pkgs-[0-9]*
ROS_METAPKG= yes
CMAKE_ARGS+=\
diff --git a/prf-gazebo-ros-pkgs/Makefile b/prf-gazebo-ros-pkgs/Makefile
index 79d8f31d..6347697b 100644
--- a/prf-gazebo-ros-pkgs/Makefile
+++ b/prf-gazebo-ros-pkgs/Makefile
@@ -24,7 +24,7 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd
-CONFLICTS+= gazebo-ros-control-[0-9]*
+CONFLICTS+= gazebo-ros-pkgs-[0-9]*
ROS_METAPKG= yes
CMAKE_ARGS+=\
--
GitLab