From 5696164b3f4827b3f157b8695ebddf844f172129 Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@openrobotics.org>
Date: Wed, 25 Mar 2020 13:23:31 +0000
Subject: [PATCH] [melodic]: Switch dependency back to python-rosdep.

Prior to https://github.com/ros/rospack/pull/109 , installing
ros-melodic-desktop on Melodic installed the `rosdep` command-line.
After that change, it no longer does.  For backwards compatibility
reasons, revert that change just for melodic.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
---
 package.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.xml b/package.xml
index e6c9d7e..a347a73 100644
--- a/package.xml
+++ b/package.xml
@@ -30,8 +30,12 @@
 
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg-modules</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg-modules</exec_depend>
-  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rosdep-modules</exec_depend>
-  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rosdep-modules</exec_depend>
+  <!-- This package really only depends on python-rosdep-modules, but in order
+       to keep installing the rosdep command-line tool in Melodic we depend on
+       python-rosdep.
+  -->
+  <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 condition="$ROS_PYTHON_VERSION == 2">python-coverage</test_depend>