From 1a95940714fdf0457ce2d9b4e79509e180678d36 Mon Sep 17 00:00:00 2001
From: Felix Mauch <mauch@fzi.de>
Date: Tue, 2 Jul 2019 17:56:13 +0200
Subject: [PATCH] migrated all package.xml files to format=2 (#439)
---
universal_robot/package.xml | 4 ++--
ur10_e_moveit_config/package.xml | 22 +++++++++++-----------
ur10_moveit_config/package.xml | 22 +++++++++++-----------
ur3_e_moveit_config/package.xml | 22 +++++++++++-----------
ur3_moveit_config/package.xml | 22 +++++++++++-----------
ur5_e_moveit_config/package.xml | 22 +++++++++++-----------
ur5_moveit_config/package.xml | 22 +++++++++++-----------
ur_bringup/package.xml | 10 +++++-----
ur_description/package.xml | 12 ++++++------
ur_driver/package.xml | 21 ++++++++++-----------
ur_e_description/package.xml | 12 ++++++------
ur_e_gazebo/package.xml | 22 +++++++++++-----------
ur_gazebo/package.xml | 22 +++++++++++-----------
ur_kinematics/package.xml | 30 +++++++++++-------------------
ur_msgs/package.xml | 7 +++----
15 files changed, 131 insertions(+), 141 deletions(-)
diff --git a/universal_robot/package.xml b/universal_robot/package.xml
index 714d438..fb67a0f 100644
--- a/universal_robot/package.xml
+++ b/universal_robot/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="2">
<name>universal_robot</name>
<version>1.2.5</version>
<description>
@@ -20,7 +20,7 @@
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<buildtool_depend>catkin</buildtool_depend>
- <run_depend>universal_robots</run_depend>
+ <exec_depend>universal_robots</exec_depend>
<export>
<metapackage/>
diff --git a/ur10_e_moveit_config/package.xml b/ur10_e_moveit_config/package.xml
index 14cb73a..bceb803 100644
--- a/ur10_e_moveit_config/package.xml
+++ b/ur10_e_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur10_e_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur10_moveit_config/package.xml b/ur10_moveit_config/package.xml
index 7dc3792..443544c 100644
--- a/ur10_moveit_config/package.xml
+++ b/ur10_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur10_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur3_e_moveit_config/package.xml b/ur3_e_moveit_config/package.xml
index 5ee355b..bfdb3f9 100644
--- a/ur3_e_moveit_config/package.xml
+++ b/ur3_e_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur3_e_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur3_moveit_config/package.xml b/ur3_moveit_config/package.xml
index c1389e0..3a0920c 100644
--- a/ur3_moveit_config/package.xml
+++ b/ur3_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur3_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur5_e_moveit_config/package.xml b/ur5_e_moveit_config/package.xml
index 64ff6ce..f81c4cc 100644
--- a/ur5_e_moveit_config/package.xml
+++ b/ur5_e_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur5_e_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur5_moveit_config/package.xml b/ur5_moveit_config/package.xml
index 3a1b4e0..cd65074 100644
--- a/ur5_moveit_config/package.xml
+++ b/ur5_moveit_config/package.xml
@@ -1,4 +1,5 @@
-<package>
+<?xml version="1.0"?>
+<package format="2">
<name>ur5_moveit_config</name>
<version>1.2.5</version>
@@ -16,16 +17,15 @@
<url type="bugtracker">https://github.com/ros-planning/moveit_setup_assistant/issues</url>
<url type="repository">https://github.com/ros-planning/moveit_setup_assistant</url>
- <run_depend>moveit_ros_move_group</run_depend>
- <run_depend>moveit_planners_ompl</run_depend>
- <run_depend>moveit_ros_visualization</run_depend>
- <run_depend>moveit_fake_controller_manager</run_depend>
- <run_depend>moveit_simple_controller_manager</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>xacro</run_depend>
- <build_depend>ur_description</build_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>moveit_ros_move_group</exec_depend>
+ <exec_depend>moveit_planners_ompl</exec_depend>
+ <exec_depend>moveit_ros_visualization</exec_depend>
+ <exec_depend>moveit_fake_controller_manager</exec_depend>
+ <exec_depend>moveit_simple_controller_manager</exec_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>xacro</exec_depend>
+ <depend>ur_description</depend>
<test_depend>roslaunch</test_depend>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/ur_bringup/package.xml b/ur_bringup/package.xml
index 13177fc..137cf3b 100644
--- a/ur_bringup/package.xml
+++ b/ur_bringup/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_bringup</name>
<version>1.2.5</version>
<description>The ur_bringup package</description>
@@ -16,10 +16,10 @@
<buildtool_depend>catkin</buildtool_depend>
<test_depend>roslaunch</test_depend>
- <run_depend>tf2_ros</run_depend>
- <run_depend>ur_description</run_depend>
- <run_depend>ur_driver</run_depend>
- <run_depend>robot_state_publisher</run_depend>
+ <exec_depend>tf2_ros</exec_depend>
+ <exec_depend>ur_description</exec_depend>
+ <exec_depend>ur_driver</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
<export>
</export>
diff --git a/ur_description/package.xml b/ur_description/package.xml
index f5af9a9..0fc7791 100644
--- a/ur_description/package.xml
+++ b/ur_description/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_description</name>
<version>1.2.5</version>
<description>
@@ -19,11 +19,11 @@
<url type="website">http://ros.org/wiki/ur_description</url>
<buildtool_depend>catkin</buildtool_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rviz</run_depend>
- <run_depend>urdf</run_depend>
- <run_depend>xacro</run_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>rviz</exec_depend>
+ <exec_depend>urdf</exec_depend>
+ <exec_depend>xacro</exec_depend>
<export>
</export>
diff --git a/ur_driver/package.xml b/ur_driver/package.xml
index 0e4c3bc..dc41849 100644
--- a/ur_driver/package.xml
+++ b/ur_driver/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_driver</name>
<version>1.2.5</version>
<description>
@@ -17,14 +17,13 @@
<url type="website">http://ros.org/wiki/ur_driver</url>
<buildtool_depend>catkin</buildtool_depend>
- <build_depend>dynamic_reconfigure</build_depend>
-
- <run_depend>rospy</run_depend>
- <run_depend>actionlib</run_depend>
- <run_depend>control_msgs</run_depend>
- <run_depend>sensor_msgs</run_depend>
- <run_depend>trajectory_msgs</run_depend>
- <run_depend>ur_msgs</run_depend>
- <run_depend>python-lxml</run_depend>
- <run_depend>dynamic_reconfigure</run_depend>
+ <depend>dynamic_reconfigure</depend>
+
+ <exec_depend>rospy</exec_depend>
+ <exec_depend>actionlib</exec_depend>
+ <exec_depend>control_msgs</exec_depend>
+ <exec_depend>sensor_msgs</exec_depend>
+ <exec_depend>trajectory_msgs</exec_depend>
+ <exec_depend>ur_msgs</exec_depend>
+ <exec_depend>python-lxml</exec_depend>
</package>
diff --git a/ur_e_description/package.xml b/ur_e_description/package.xml
index 78daff8..e877649 100644
--- a/ur_e_description/package.xml
+++ b/ur_e_description/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_e_description</name>
<version>1.2.5</version>
<description>
@@ -19,11 +19,11 @@
<url type="website">http://ros.org/wiki/ur_e_description</url>
<buildtool_depend>catkin</buildtool_depend>
- <run_depend>joint_state_publisher</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rviz</run_depend>
- <run_depend>urdf</run_depend>
- <run_depend>xacro</run_depend>
+ <exec_depend>joint_state_publisher</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>rviz</exec_depend>
+ <exec_depend>urdf</exec_depend>
+ <exec_depend>xacro</exec_depend>
<export>
</export>
diff --git a/ur_e_gazebo/package.xml b/ur_e_gazebo/package.xml
index 0919796..e738b7e 100644
--- a/ur_e_gazebo/package.xml
+++ b/ur_e_gazebo/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_e_gazebo</name>
<version>1.2.5</version>
<description>
@@ -20,16 +20,16 @@
<buildtool_depend>catkin</buildtool_depend>
<test_depend>roslaunch</test_depend>
- <run_depend>controller_manager</run_depend>
- <run_depend>effort_controllers</run_depend>
- <run_depend>joint_state_controller</run_depend>
- <run_depend>joint_trajectory_controller</run_depend>
- <run_depend>gazebo_ros</run_depend>
- <run_depend>gazebo_ros_control</run_depend>
- <run_depend>position_controllers</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rostopic</run_depend>
- <run_depend>ur_e_description</run_depend>
+ <exec_depend>controller_manager</exec_depend>
+ <exec_depend>effort_controllers</exec_depend>
+ <exec_depend>joint_state_controller</exec_depend>
+ <exec_depend>joint_trajectory_controller</exec_depend>
+ <exec_depend>gazebo_ros</exec_depend>
+ <exec_depend>gazebo_ros_control</exec_depend>
+ <exec_depend>position_controllers</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>rostopic</exec_depend>
+ <exec_depend>ur_e_description</exec_depend>
<export>
diff --git a/ur_gazebo/package.xml b/ur_gazebo/package.xml
index 0bc1f0c..506cef0 100644
--- a/ur_gazebo/package.xml
+++ b/ur_gazebo/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_gazebo</name>
<version>1.2.5</version>
<description>
@@ -20,16 +20,16 @@
<buildtool_depend>catkin</buildtool_depend>
<test_depend>roslaunch</test_depend>
- <run_depend>controller_manager</run_depend>
- <run_depend>effort_controllers</run_depend>
- <run_depend>gazebo_ros</run_depend>
- <run_depend>gazebo_ros_control</run_depend>
- <run_depend>joint_state_controller</run_depend>
- <run_depend>joint_trajectory_controller</run_depend>
- <run_depend>position_controllers</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rostopic</run_depend>
- <run_depend>ur_description</run_depend>
+ <exec_depend>controller_manager</exec_depend>
+ <exec_depend>effort_controllers</exec_depend>
+ <exec_depend>gazebo_ros</exec_depend>
+ <exec_depend>gazebo_ros_control</exec_depend>
+ <exec_depend>joint_state_controller</exec_depend>
+ <exec_depend>joint_trajectory_controller</exec_depend>
+ <exec_depend>position_controllers</exec_depend>
+ <exec_depend>robot_state_publisher</exec_depend>
+ <exec_depend>rostopic</exec_depend>
+ <exec_depend>ur_description</exec_depend>
<export>
</export>
diff --git a/ur_kinematics/package.xml b/ur_kinematics/package.xml
index 608dc3a..8e9b1fd 100644
--- a/ur_kinematics/package.xml
+++ b/ur_kinematics/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_kinematics</name>
<version>1.2.5</version>
<description>
@@ -15,27 +15,19 @@
<url type="website">http://wiki.ros.org/ur_kinematics</url>
<url type="bugtracker">https://github.com/ros-industrial/universal_robot/issues</url>
<url type="repository">https://github.com/ros-industrial/universal_robot</url>
-
+
<buildtool_depend>catkin</buildtool_depend>
- <build_depend>moveit_core</build_depend>
- <build_depend>moveit_kinematics</build_depend>
- <build_depend>moveit_ros_planning</build_depend>
- <build_depend>roscpp</build_depend>
- <build_depend>geometry_msgs</build_depend>
- <build_depend>pluginlib</build_depend>
- <build_depend>tf_conversions</build_depend>
- <build_depend>boost</build_depend>
+ <depend>moveit_core</depend>
+ <depend>moveit_kinematics</depend>
+ <depend>moveit_ros_planning</depend>
+ <depend>roscpp</depend>
+ <depend>geometry_msgs</depend>
+ <depend>pluginlib</depend>
+ <depend>tf_conversions</depend>
+ <depend>boost</depend>
- <run_depend>rospy</run_depend>
- <run_depend>moveit_core</run_depend>
- <run_depend>moveit_kinematics</run_depend>
- <run_depend>moveit_ros_planning</run_depend>
- <run_depend>roscpp</run_depend>
- <run_depend>geometry_msgs</run_depend>
- <run_depend>pluginlib</run_depend>
- <run_depend>tf_conversions</run_depend>
- <run_depend>boost</run_depend>
+ <exec_depend>rospy</exec_depend>
<export>
<moveit_core plugin="${prefix}/ur_moveit_plugins.xml"/>
diff --git a/ur_msgs/package.xml b/ur_msgs/package.xml
index d35cbba..3b2b3c3 100644
--- a/ur_msgs/package.xml
+++ b/ur_msgs/package.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>ur_msgs</name>
<version>1.2.5</version>
<description>The ur_msgs package</description>
@@ -14,9 +14,8 @@
<buildtool_depend>catkin</buildtool_depend>
<build_depend>message_generation</build_depend>
- <build_depend>std_msgs</build_depend>
- <run_depend>message_runtime</run_depend>
- <run_depend>std_msgs</run_depend>
+ <depend>std_msgs</depend>
+ <exec_depend>message_runtime</exec_depend>
<export>
</export>
--
GitLab