From 38b2ae58da78e171e67c95d9753cb9db500e5d82 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sat, 16 Mar 2019 12:56:03 -0400
Subject: [PATCH] robotics-suite: Remove retired packages

Remove the catkin package, which has been orphaned for f30 and above.

Replace python2-player with python3-player.

Signed-off-by: Rich Mattes <richmattes@gmail.com>
---
 comps-f30.xml.in | 3 +--
 comps-f31.xml.in | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 74779ad5..545c22f6 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -4743,7 +4743,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">arduino</packagereq>
-      <packagereq type="default">catkin</packagereq>
       <packagereq type="default">eclipse-cdt</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
@@ -4783,7 +4782,7 @@
       <packagereq type="default">player-doc</packagereq>
       <packagereq type="default">player-examples</packagereq>
       <packagereq type="default">player-stage</packagereq>
-      <packagereq type="default">python2-player</packagereq>
+      <packagereq type="default">python3-player</packagereq>
       <packagereq type="default">python3-bloom</packagereq>
       <packagereq type="default">python3-catkin_lint</packagereq>
       <packagereq type="default">python3-catkin_pkg</packagereq>
diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 74779ad5..545c22f6 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -4743,7 +4743,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">arduino</packagereq>
-      <packagereq type="default">catkin</packagereq>
       <packagereq type="default">eclipse-cdt</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
@@ -4783,7 +4782,7 @@
       <packagereq type="default">player-doc</packagereq>
       <packagereq type="default">player-examples</packagereq>
       <packagereq type="default">player-stage</packagereq>
-      <packagereq type="default">python2-player</packagereq>
+      <packagereq type="default">python3-player</packagereq>
       <packagereq type="default">python3-bloom</packagereq>
       <packagereq type="default">python3-catkin_lint</packagereq>
       <packagereq type="default">python3-catkin_pkg</packagereq>