From 2f43b5320146dad8566ff50bae46edcb3762156b Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Thu, 8 Aug 2019 17:25:13 -0700
Subject: [PATCH] use condition attributes to specify Python 2 and 3
 dependencies

---
 package.xml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/package.xml b/package.xml
index 3883a91..806ee05 100644
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,8 @@
-<package>
+<?xml version="1.0"?>
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>rospack</name>
   <version>2.5.3</version>
   <description>ROS Package Tool</description>
@@ -13,22 +17,23 @@
   <author>Morgan Quigley</author>
   <author>Dirk Thomas</author>
 
+  <depend>boost</depend>
+  <depend>pkg-config</depend>
+  <depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
+  <depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
+  <depend>tinyxml2</depend>
+
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>boost</build_depend>
   <build_depend>cmake_modules</build_depend>
   <build_depend>gtest</build_depend>
-  <build_depend>pkg-config</build_depend>
-  <build_depend>python</build_depend>
-  <build_depend>tinyxml2</build_depend>
 
-  <run_depend>boost</run_depend>
-  <run_depend>pkg-config</run_depend>
-  <run_depend>python</run_depend>
-  <run_depend>python-catkin-pkg</run_depend>
-  <run_depend>python-rosdep</run_depend>
-  <run_depend>ros_environment</run_depend>
-  <run_depend>tinyxml2</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rosdep</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rosdep</exec_depend>
+  <exec_depend>ros_environment</exec_depend>
 
-  <test_depend>python-coverage</test_depend>
+  <test_depend condition="$ROS_PYTHON_VERSION == 2">python-coverage</test_depend>
+  <test_depend condition="$ROS_PYTHON_VERSION == 3">python3-coverage</test_depend>
 </package>