From 4a71d3a251c25310e226ebbb3630c0c7dd98b00a Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:14:42 -0700
Subject: [PATCH] use condition attributes to specify Python 2 and 3
 dependencies (#226)

---
 core/roslib/package.xml     | 21 ++++++++++++++-------
 tools/rosclean/package.xml  | 13 ++++++++++---
 tools/roscreate/package.xml | 15 +++++++++++----
 tools/rosmake/package.xml   | 15 +++++++++++----
 tools/rosunit/package.xml   | 13 +++++++++----
 5 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/core/roslib/package.xml b/core/roslib/package.xml
index 46f7861a..bdc45a18 100644
--- a/core/roslib/package.xml
+++ b/core/roslib/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>roslib</name>
   <version>1.14.6</version>
   <description>
@@ -8,20 +12,23 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url>http://ros.org/wiki/roslib</url>
+  <url type="website">http://wiki.ros.org/roslib</url>
+  <url type="bugtracker">https://github.com/ros/ros/issues</url>
+  <url type="repository">https://github.com/ros/ros</url>
   <author email="kwc@willowgarage.com">Ken Conley</author>
   <author email="mquigley@cs.stanford.edu">Morgan Quigley</author>
   <author email="jfaust@willowgarage.com">Josh Faust</author>
 
+  <depend>rospack</depend>
+
   <buildtool_depend version_gte="0.6.7">catkin</buildtool_depend>
 
   <build_depend>boost</build_depend>
-  <build_depend>rospack</build_depend>
 
-  <run_depend>catkin</run_depend>
-  <run_depend version_gte="1.0.37">python-rospkg</run_depend>
-  <run_depend>ros_environment</run_depend>
-  <run_depend>rospack</run_depend>
+  <exec_depend>catkin</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2" version_gte="1.0.37">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3" version_gte="1.0.37">python3-rospkg</exec_depend>
+  <exec_depend>ros_environment</exec_depend>
 
   <test_depend>rosmake</test_depend>
 
diff --git a/tools/rosclean/package.xml b/tools/rosclean/package.xml
index b2d1a4a5..81325c8f 100644
--- a/tools/rosclean/package.xml
+++ b/tools/rosclean/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>rosclean</name>
   <version>1.14.6</version>
   <description>
@@ -7,10 +11,13 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url>http://ros.org/wiki/rosclean</url>
+  <url type="website">http://wiki.ros.org/rosclean</url>
+  <url type="bugtracker">https://github.com/ros/ros/issues</url>
+  <url type="repository">https://github.com/ros/ros</url>
   <author>Ken Conley</author>
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <run_depend>python-rospkg</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
 </package>
diff --git a/tools/roscreate/package.xml b/tools/roscreate/package.xml
index b15f3487..a8e4f43f 100644
--- a/tools/roscreate/package.xml
+++ b/tools/roscreate/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>roscreate</name>
   <version>1.14.6</version>
   <description>
@@ -9,12 +13,15 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url type="website">http://ros.org/wiki/roscreate</url>
+  <url type="website">http://wiki.ros.org/roscreate</url>
+  <url type="bugtracker">https://github.com/ros/ros/issues</url>
+  <url type="repository">https://github.com/ros/ros</url>
 
   <author email="kwc@willowgarage.com">Ken Conley</author>
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <run_depend>python-rospkg</run_depend>
-  <run_depend>roslib</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
+  <exec_depend>roslib</exec_depend>
 </package>
diff --git a/tools/rosmake/package.xml b/tools/rosmake/package.xml
index ce9a7796..41b9ae70 100644
--- a/tools/rosmake/package.xml
+++ b/tools/rosmake/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>rosmake</name>
   <version>1.14.6</version>
   <description>
@@ -8,13 +12,16 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url>http://ros.org/wiki/rosmake</url>
+  <url type="website">http://wiki.ros.org/rosmake</url>
+  <url type="bugtracker">https://github.com/ros/ros/issues</url>
+  <url type="repository">https://github.com/ros/ros</url>
   <author email="tfoote@osrfoundation.org">Tully Foote</author>
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <run_depend>catkin</run_depend>
-  <run_depend>python-rospkg</run_depend>
+  <exec_depend>catkin</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
 
   <export>
     <rosdoc config="rosdoc.yaml"/>
diff --git a/tools/rosunit/package.xml b/tools/rosunit/package.xml
index 8d657940..f974144f 100644
--- a/tools/rosunit/package.xml
+++ b/tools/rosunit/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>rosunit</name>
   <version>1.14.6</version>
   <description>
@@ -7,15 +11,16 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url type="website">http://ros.org/wiki/rosunit</url>
+  <url type="website">http://wiki.ros.org/rosunit</url>
   <url type="bugtracker">https://github.com/ros/ros/issues</url>
   <url type="repository">https://github.com/ros/ros</url>
   <author>Ken Conley</author>
 
   <buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
 
-  <run_depend>python-rospkg</run_depend>
-  <run_depend>roslib</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
+  <exec_depend>roslib</exec_depend>
 
   <export>
     <rosdoc config="rosdoc.yaml" />