From 01ce6c9ee862d845d59d2933e36487f994c37c40 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 22 Aug 2019 13:14:17 +0200
Subject: [PATCH] [wip/ros-universal-robot] Update to 1.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Changes since v1.2.1:
- Update maintainer listing: add Miguel
- Add new metapackage, first step to rename the repo
- UR-E Series
- Update maintainer and author information.
- Contributors: Dave Niewinski, Nadia Hammoudeh GarcÃa, gavanderhoorn
Packaging changes:
- remove patch-aa, fixed upstream
---
ros-universal-robot/Makefile | 3 +-
ros-universal-robot/PLIST | 171 +++++++++++++++++++++++++++
ros-universal-robot/distinfo | 7 +-
ros-universal-robot/patches/patch-aa | 13 --
4 files changed, 175 insertions(+), 19 deletions(-)
delete mode 100644 ros-universal-robot/patches/patch-aa
diff --git a/ros-universal-robot/Makefile b/ros-universal-robot/Makefile
index a0568009..ba90e44f 100644
--- a/ros-universal-robot/Makefile
+++ b/ros-universal-robot/Makefile
@@ -4,9 +4,8 @@
ROS_PKG= universal_robot
ROS_METAPKG= yes
-ROS_VERSION= 1.2.1
+ROS_VERSION= 1.2.5
ROS_REPO= ros-industrial
-PKGREVISION= 1
PKGNAME= ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
diff --git a/ros-universal-robot/PLIST b/ros-universal-robot/PLIST
index 3444af45..a40a3456 100644
--- a/ros-universal-robot/PLIST
+++ b/ros-universal-robot/PLIST
@@ -7,6 +7,7 @@ include/ur_msgs/Analog.h
include/ur_msgs/Digital.h
include/ur_msgs/IOStates.h
include/ur_msgs/MasterboardDataMsg.h
+include/ur_msgs/RobotModeDataMsg.h
include/ur_msgs/RobotStateRTMsg.h
include/ur_msgs/SetIO.h
include/ur_msgs/SetIORequest.h
@@ -21,12 +22,17 @@ lib/libur3_kin.so
lib/libur3_moveit_plugin.so
lib/libur5_kin.so
lib/libur5_moveit_plugin.so
+lib/pkgconfig/ur10_e_moveit_config.pc
lib/pkgconfig/ur10_moveit_config.pc
+lib/pkgconfig/ur3_e_moveit_config.pc
lib/pkgconfig/ur3_moveit_config.pc
+lib/pkgconfig/ur5_e_moveit_config.pc
lib/pkgconfig/ur5_moveit_config.pc
lib/pkgconfig/ur_bringup.pc
lib/pkgconfig/ur_description.pc
lib/pkgconfig/ur_driver.pc
+lib/pkgconfig/ur_e_description.pc
+lib/pkgconfig/ur_e_gazebo.pc
lib/pkgconfig/ur_gazebo.pc
lib/pkgconfig/ur_kinematics.pc
lib/pkgconfig/ur_msgs.pc
@@ -40,11 +46,15 @@ ${PYTHON_SITELIB}/ur_driver/driver.py
${PYTHON_SITELIB}/ur_driver/io_interface.py
${PYTHON_SITELIB}/ur_driver/testRT_comm.py
${PYTHON_SITELIB}/ur_driver/test_comm.py
+${PYTHON_SITELIB}/ur_kinematics-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
+${PYTHON_SITELIB}/ur_kinematics/__init__.py
+${PYTHON_SITELIB}/ur_kinematics/test_analytical_ik.py
${PYTHON_SITELIB}/ur_msgs/__init__.py
${PYTHON_SITELIB}/ur_msgs/msg/_Analog.py
${PYTHON_SITELIB}/ur_msgs/msg/_Digital.py
${PYTHON_SITELIB}/ur_msgs/msg/_IOStates.py
${PYTHON_SITELIB}/ur_msgs/msg/_MasterboardDataMsg.py
+${PYTHON_SITELIB}/ur_msgs/msg/_RobotModeDataMsg.py
${PYTHON_SITELIB}/ur_msgs/msg/_RobotStateRTMsg.py
${PYTHON_SITELIB}/ur_msgs/msg/_ToolDataMsg.py
${PYTHON_SITELIB}/ur_msgs/msg/__init__.py
@@ -58,6 +68,7 @@ share/common-lisp/ros/ur_msgs/msg/Analog.lisp
share/common-lisp/ros/ur_msgs/msg/Digital.lisp
share/common-lisp/ros/ur_msgs/msg/IOStates.lisp
share/common-lisp/ros/ur_msgs/msg/MasterboardDataMsg.lisp
+share/common-lisp/ros/ur_msgs/msg/RobotModeDataMsg.lisp
share/common-lisp/ros/ur_msgs/msg/RobotStateRTMsg.lisp
share/common-lisp/ros/ur_msgs/msg/ToolDataMsg.lisp
share/common-lisp/ros/ur_msgs/msg/_package.lisp
@@ -65,6 +76,7 @@ share/common-lisp/ros/ur_msgs/msg/_package_Analog.lisp
share/common-lisp/ros/ur_msgs/msg/_package_Digital.lisp
share/common-lisp/ros/ur_msgs/msg/_package_IOStates.lisp
share/common-lisp/ros/ur_msgs/msg/_package_MasterboardDataMsg.lisp
+share/common-lisp/ros/ur_msgs/msg/_package_RobotModeDataMsg.lisp
share/common-lisp/ros/ur_msgs/msg/_package_RobotStateRTMsg.lisp
share/common-lisp/ros/ur_msgs/msg/_package_ToolDataMsg.lisp
share/common-lisp/ros/ur_msgs/msg/ur_msgs-msg.asd
@@ -75,6 +87,34 @@ share/common-lisp/ros/ur_msgs/srv/_package_SetIO.lisp
share/common-lisp/ros/ur_msgs/srv/_package_SetPayload.lisp
share/common-lisp/ros/ur_msgs/srv/ur_msgs-srv.asd
share/universal_robot/package.xml
+share/universal_robots/package.xml
+share/ur10_e_moveit_config/cmake/ur10_e_moveit_configConfig-version.cmake
+share/ur10_e_moveit_config/cmake/ur10_e_moveit_configConfig.cmake
+share/ur10_e_moveit_config/config/controllers.yaml
+share/ur10_e_moveit_config/config/fake_controllers.yaml
+share/ur10_e_moveit_config/config/joint_limits.yaml
+share/ur10_e_moveit_config/config/kinematics.yaml
+share/ur10_e_moveit_config/config/ompl_planning.yaml
+share/ur10_e_moveit_config/config/ur10e.srdf
+share/ur10_e_moveit_config/launch/default_warehouse_db.launch
+share/ur10_e_moveit_config/launch/demo.launch
+share/ur10_e_moveit_config/launch/fake_moveit_controller_manager.launch.xml
+share/ur10_e_moveit_config/launch/move_group.launch
+share/ur10_e_moveit_config/launch/moveit.rviz
+share/ur10_e_moveit_config/launch/moveit_rviz.launch
+share/ur10_e_moveit_config/launch/ompl_planning_pipeline.launch.xml
+share/ur10_e_moveit_config/launch/planning_context.launch
+share/ur10_e_moveit_config/launch/planning_pipeline.launch.xml
+share/ur10_e_moveit_config/launch/run_benchmark_ompl.launch
+share/ur10_e_moveit_config/launch/sensor_manager.launch.xml
+share/ur10_e_moveit_config/launch/setup_assistant.launch
+share/ur10_e_moveit_config/launch/trajectory_execution.launch.xml
+share/ur10_e_moveit_config/launch/ur10_e_moveit_controller_manager.launch.xml
+share/ur10_e_moveit_config/launch/ur10_e_moveit_planning_execution.launch
+share/ur10_e_moveit_config/launch/ur10_e_moveit_sensor_manager.launch.xml
+share/ur10_e_moveit_config/launch/warehouse.launch
+share/ur10_e_moveit_config/launch/warehouse_settings.launch.xml
+share/ur10_e_moveit_config/package.xml
share/ur10_moveit_config/cmake/ur10_moveit_configConfig-version.cmake
share/ur10_moveit_config/cmake/ur10_moveit_configConfig.cmake
share/ur10_moveit_config/config/controllers.yaml
@@ -102,6 +142,34 @@ share/ur10_moveit_config/launch/ur10_moveit_sensor_manager.launch.xml
share/ur10_moveit_config/launch/warehouse.launch
share/ur10_moveit_config/launch/warehouse_settings.launch.xml
share/ur10_moveit_config/package.xml
+share/ur3_e_moveit_config/cmake/ur3_e_moveit_configConfig-version.cmake
+share/ur3_e_moveit_config/cmake/ur3_e_moveit_configConfig.cmake
+share/ur3_e_moveit_config/config/controllers.yaml
+share/ur3_e_moveit_config/config/fake_controllers.yaml
+share/ur3_e_moveit_config/config/joint_limits.yaml
+share/ur3_e_moveit_config/config/kinematics.yaml
+share/ur3_e_moveit_config/config/ompl_planning.yaml
+share/ur3_e_moveit_config/config/ur3e.srdf
+share/ur3_e_moveit_config/launch/default_warehouse_db.launch
+share/ur3_e_moveit_config/launch/demo.launch
+share/ur3_e_moveit_config/launch/fake_moveit_controller_manager.launch.xml
+share/ur3_e_moveit_config/launch/joystick_control.launch
+share/ur3_e_moveit_config/launch/move_group.launch
+share/ur3_e_moveit_config/launch/moveit.rviz
+share/ur3_e_moveit_config/launch/moveit_rviz.launch
+share/ur3_e_moveit_config/launch/ompl_planning_pipeline.launch.xml
+share/ur3_e_moveit_config/launch/planning_context.launch
+share/ur3_e_moveit_config/launch/planning_pipeline.launch.xml
+share/ur3_e_moveit_config/launch/run_benchmark_ompl.launch
+share/ur3_e_moveit_config/launch/sensor_manager.launch.xml
+share/ur3_e_moveit_config/launch/setup_assistant.launch
+share/ur3_e_moveit_config/launch/trajectory_execution.launch.xml
+share/ur3_e_moveit_config/launch/ur3_e_moveit_controller_manager.launch.xml
+share/ur3_e_moveit_config/launch/ur3_e_moveit_planning_execution.launch
+share/ur3_e_moveit_config/launch/ur3_e_moveit_sensor_manager.launch.xml
+share/ur3_e_moveit_config/launch/warehouse.launch
+share/ur3_e_moveit_config/launch/warehouse_settings.launch.xml
+share/ur3_e_moveit_config/package.xml
share/ur3_moveit_config/cmake/ur3_moveit_configConfig-version.cmake
share/ur3_moveit_config/cmake/ur3_moveit_configConfig.cmake
share/ur3_moveit_config/config/controllers.yaml
@@ -130,6 +198,33 @@ share/ur3_moveit_config/launch/ur3_moveit_sensor_manager.launch.xml
share/ur3_moveit_config/launch/warehouse.launch
share/ur3_moveit_config/launch/warehouse_settings.launch.xml
share/ur3_moveit_config/package.xml
+share/ur5_e_moveit_config/cmake/ur5_e_moveit_configConfig-version.cmake
+share/ur5_e_moveit_config/cmake/ur5_e_moveit_configConfig.cmake
+share/ur5_e_moveit_config/config/controllers.yaml
+share/ur5_e_moveit_config/config/fake_controllers.yaml
+share/ur5_e_moveit_config/config/joint_limits.yaml
+share/ur5_e_moveit_config/config/kinematics.yaml
+share/ur5_e_moveit_config/config/ompl_planning.yaml
+share/ur5_e_moveit_config/config/ur5e.srdf
+share/ur5_e_moveit_config/launch/default_warehouse_db.launch
+share/ur5_e_moveit_config/launch/demo.launch
+share/ur5_e_moveit_config/launch/fake_moveit_controller_manager.launch.xml
+share/ur5_e_moveit_config/launch/move_group.launch
+share/ur5_e_moveit_config/launch/moveit.rviz
+share/ur5_e_moveit_config/launch/moveit_rviz.launch
+share/ur5_e_moveit_config/launch/ompl_planning_pipeline.launch.xml
+share/ur5_e_moveit_config/launch/planning_context.launch
+share/ur5_e_moveit_config/launch/planning_pipeline.launch.xml
+share/ur5_e_moveit_config/launch/run_benchmark_ompl.launch
+share/ur5_e_moveit_config/launch/sensor_manager.launch.xml
+share/ur5_e_moveit_config/launch/setup_assistant.launch
+share/ur5_e_moveit_config/launch/trajectory_execution.launch.xml
+share/ur5_e_moveit_config/launch/ur5_e_moveit_controller_manager.launch.xml
+share/ur5_e_moveit_config/launch/ur5_e_moveit_planning_execution.launch
+share/ur5_e_moveit_config/launch/ur5_e_moveit_sensor_manager.launch.xml
+share/ur5_e_moveit_config/launch/warehouse.launch
+share/ur5_e_moveit_config/launch/warehouse_settings.launch.xml
+share/ur5_e_moveit_config/package.xml
share/ur5_moveit_config/cmake/ur5_moveit_configConfig-version.cmake
share/ur5_moveit_config/cmake/ur5_moveit_configConfig.cmake
share/ur5_moveit_config/config/controllers.yaml
@@ -233,6 +328,81 @@ share/ur_driver/cmake/ur_driverConfig.cmake
share/ur_driver/package.xml
share/ur_driver/prog
share/ur_driver/prog_reset
+share/ur_e_description/cmake/ur_e_descriptionConfig-version.cmake
+share/ur_e_description/cmake/ur_e_descriptionConfig.cmake
+share/ur_e_description/launch/test.launch
+share/ur_e_description/launch/ur10e_upload.launch
+share/ur_e_description/launch/ur3e_upload.launch
+share/ur_e_description/launch/ur5e_upload.launch
+share/ur_e_description/meshes/ur10e/collision/base.stl
+share/ur_e_description/meshes/ur10e/collision/forearm.stl
+share/ur_e_description/meshes/ur10e/collision/shoulder.stl
+share/ur_e_description/meshes/ur10e/collision/upperarm.stl
+share/ur_e_description/meshes/ur10e/collision/wrist1.stl
+share/ur_e_description/meshes/ur10e/collision/wrist2.stl
+share/ur_e_description/meshes/ur10e/collision/wrist3.stl
+share/ur_e_description/meshes/ur10e/visual/base.dae
+share/ur_e_description/meshes/ur10e/visual/forearm.dae
+share/ur_e_description/meshes/ur10e/visual/shoulder.dae
+share/ur_e_description/meshes/ur10e/visual/upperarm.dae
+share/ur_e_description/meshes/ur10e/visual/wrist1.dae
+share/ur_e_description/meshes/ur10e/visual/wrist2.dae
+share/ur_e_description/meshes/ur10e/visual/wrist3.dae
+share/ur_e_description/meshes/ur3e/collision/base.stl
+share/ur_e_description/meshes/ur3e/collision/forearm.stl
+share/ur_e_description/meshes/ur3e/collision/shoulder.stl
+share/ur_e_description/meshes/ur3e/collision/upperarm.stl
+share/ur_e_description/meshes/ur3e/collision/wrist1.stl
+share/ur_e_description/meshes/ur3e/collision/wrist2.stl
+share/ur_e_description/meshes/ur3e/collision/wrist3.stl
+share/ur_e_description/meshes/ur3e/visual/base.dae
+share/ur_e_description/meshes/ur3e/visual/forearm.dae
+share/ur_e_description/meshes/ur3e/visual/shoulder.dae
+share/ur_e_description/meshes/ur3e/visual/upperarm.dae
+share/ur_e_description/meshes/ur3e/visual/wrist1.dae
+share/ur_e_description/meshes/ur3e/visual/wrist2.dae
+share/ur_e_description/meshes/ur3e/visual/wrist3.dae
+share/ur_e_description/meshes/ur5e/collision/base.stl
+share/ur_e_description/meshes/ur5e/collision/forearm.stl
+share/ur_e_description/meshes/ur5e/collision/shoulder.stl
+share/ur_e_description/meshes/ur5e/collision/upperarm.stl
+share/ur_e_description/meshes/ur5e/collision/wrist1.stl
+share/ur_e_description/meshes/ur5e/collision/wrist2.stl
+share/ur_e_description/meshes/ur5e/collision/wrist3.stl
+share/ur_e_description/meshes/ur5e/visual/base.dae
+share/ur_e_description/meshes/ur5e/visual/forearm.dae
+share/ur_e_description/meshes/ur5e/visual/shoulder.dae
+share/ur_e_description/meshes/ur5e/visual/upperarm.dae
+share/ur_e_description/meshes/ur5e/visual/wrist1.dae
+share/ur_e_description/meshes/ur5e/visual/wrist2.dae
+share/ur_e_description/meshes/ur5e/visual/wrist3.dae
+share/ur_e_description/package.xml
+share/ur_e_description/urdf/common.gazebo.xacro
+share/ur_e_description/urdf/ur.gazebo.xacro
+share/ur_e_description/urdf/ur.transmission.xacro
+share/ur_e_description/urdf/ur10e.urdf.xacro
+share/ur_e_description/urdf/ur10e_joint_limited_robot.urdf.xacro
+share/ur_e_description/urdf/ur10e_robot.urdf.xacro
+share/ur_e_description/urdf/ur3e.urdf.xacro
+share/ur_e_description/urdf/ur3e_joint_limited_robot.urdf.xacro
+share/ur_e_description/urdf/ur3e_robot.urdf.xacro
+share/ur_e_description/urdf/ur5e.urdf.xacro
+share/ur_e_description/urdf/ur5e_joint_limited_robot.urdf.xacro
+share/ur_e_description/urdf/ur5e_robot.urdf.xacro
+share/ur_e_gazebo/cmake/ur_e_gazeboConfig-version.cmake
+share/ur_e_gazebo/cmake/ur_e_gazeboConfig.cmake
+share/ur_e_gazebo/controller/arm_controller_ur10e.yaml
+share/ur_e_gazebo/controller/arm_controller_ur3e.yaml
+share/ur_e_gazebo/controller/arm_controller_ur5e.yaml
+share/ur_e_gazebo/controller/joint_state_controller.yaml
+share/ur_e_gazebo/launch/controller_utils.launch
+share/ur_e_gazebo/launch/ur10e.launch
+share/ur_e_gazebo/launch/ur10e_joint_limited.launch
+share/ur_e_gazebo/launch/ur3e.launch
+share/ur_e_gazebo/launch/ur3e_joint_limited.launch
+share/ur_e_gazebo/launch/ur5e.launch
+share/ur_e_gazebo/launch/ur5e_joint_limited.launch
+share/ur_e_gazebo/package.xml
share/ur_gazebo/cmake/ur_gazeboConfig-version.cmake
share/ur_gazebo/cmake/ur_gazeboConfig.cmake
share/ur_gazebo/controller/arm_controller_ur10.yaml
@@ -259,6 +429,7 @@ share/ur_msgs/msg/Analog.msg
share/ur_msgs/msg/Digital.msg
share/ur_msgs/msg/IOStates.msg
share/ur_msgs/msg/MasterboardDataMsg.msg
+share/ur_msgs/msg/RobotModeDataMsg.msg
share/ur_msgs/msg/RobotStateRTMsg.msg
share/ur_msgs/msg/ToolDataMsg.msg
share/ur_msgs/package.xml
diff --git a/ros-universal-robot/distinfo b/ros-universal-robot/distinfo
index d5626d1f..2ca9f2df 100644
--- a/ros-universal-robot/distinfo
+++ b/ros-universal-robot/distinfo
@@ -1,4 +1,3 @@
-SHA1 (ros/universal_robot/1.2.1.tar.gz) = 921b07ad41852566d441d2bc6acee31a416cfda4
-RMD160 (ros/universal_robot/1.2.1.tar.gz) = 3a52f25ae778507eb1e6531a6fa150c7e64e0f18
-Size (ros/universal_robot/1.2.1.tar.gz) = 8071114 bytes
-SHA1 (patch-aa) = de9c178fedaa6ec9536c48fc3a1431531402475b
+SHA1 (ros/universal_robot/1.2.5.tar.gz) = 2cae8c09437f534156458f55e77df9f0511b78fc
+RMD160 (ros/universal_robot/1.2.5.tar.gz) = aaa76fed5d290e9f5f6e7bd0190f17325348ef04
+Size (ros/universal_robot/1.2.5.tar.gz) = 19191593 bytes
diff --git a/ros-universal-robot/patches/patch-aa b/ros-universal-robot/patches/patch-aa
deleted file mode 100644
index b0d80eba..00000000
--- a/ros-universal-robot/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-use boost::shared_ptr instead of std::shared_ptr for now
-
---- ur_kinematics/src/ur_moveit_plugin.cpp.orig 2018-01-06 14:52:56.000000000 +0100
-+++ ur_kinematics/src/ur_moveit_plugin.cpp 2018-12-20 17:07:18.865848488 +0100
-@@ -177,7 +177,7 @@
- rdf_loader::RDFLoader rdf_loader(robot_description_);
- const boost::shared_ptr<srdf::Model> &srdf = rdf_loader.getSRDF();
- #if ROS_VERSION_MINIMUM(1, 13, 0)
-- const std::shared_ptr<urdf::ModelInterface>& urdf_model = rdf_loader.getURDF();
-+ const boost::shared_ptr<urdf::ModelInterface>& urdf_model = rdf_loader.getURDF();
- #else
- const boost::shared_ptr<urdf::ModelInterface>& urdf_model = rdf_loader.getURDF();
- #endif
--
GitLab