From 55b444a63acdf4f1cfee6e5d5dfc7dd19991cc40 Mon Sep 17 00:00:00 2001
From: Ryosuke Tajima <ryosuke.tajima@opensource-robotics.tokyo.jp>
Date: Mon, 16 Sep 2019 22:32:03 +0900
Subject: [PATCH 1/5] Add melodic entries for travis.yml

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0ec2303..3f64e43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,12 @@ env:
   matrix:
     - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
     - USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
+    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
 matrix:
   allow_failures:
     - env: USE_DEB=true  ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
+    - env: USE_DEB=true  ROS_DISTRO="melodic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu      
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script: 

From a301fc77328d892ecbb45fd489a15f0f95935f9b Mon Sep 17 00:00:00 2001
From: Ryosuke Tajima <ryosuke.tajima@opensource-robotics.tokyo.jp>
Date: Mon, 16 Sep 2019 23:17:48 +0900
Subject: [PATCH 2/5] Remove vs060 example

---
 fake_joint_launch/launch/vs060.launch | 37 ---------------------------
 fake_joint_launch/package.xml         |  1 -
 2 files changed, 38 deletions(-)
 delete mode 100644 fake_joint_launch/launch/vs060.launch

diff --git a/fake_joint_launch/launch/vs060.launch b/fake_joint_launch/launch/vs060.launch
deleted file mode 100644
index 9f7ba89..0000000
--- a/fake_joint_launch/launch/vs060.launch
+++ /dev/null
@@ -1,37 +0,0 @@
-<launch>
-  <arg name="use_rviz" default="true"/>
-  <arg name="use_rqt" default="false"/>
-  
-  <!-- load robot description  -->
-  <param name="robot_description" command="$(find xacro)/xacro --inorder '$(find vs060)/model/vs060A1_AV6_NNN_NNN.urdf'" />
-
-  <!-- fake_joint_driver_node -->
-  <node name="fake_joint_driver" pkg="fake_joint_driver" type="fake_joint_driver_node"/>
-  
-  <!-- robot_state_publisher -->
-  <node name="robot_state_publisher" pkg="robot_state_publisher" type="robot_state_publisher"/>
-
-  <rosparam file="$(find denso_ros_control)/config/denso_controllers.yaml" />
-
-  <!-- Load and start joint trajecotory controller -->
-  <node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" args="arm_controller/joint_state_controller arm_controller/position_trajectory_controller"/>
-
-  <!-- Launch rviz -->
-  <node if="$(arg use_rviz)"
-	name="rviz" pkg="rviz" type="rviz"
-	args="-d $(find fake_joint_launch)/launch/fake_joint_launch.rviz"/>
-
-  <!-- Launch rqt joint_trajectory_controller -->
-  <node if="$(arg use_rqt)"
-	name="rqt" pkg="rqt_gui" type="rqt_gui"
-	args="-s rqt_joint_trajectory_controller.joint_trajectory_controller.JointTrajectoryController"/>
-
-  <!-- Run tests -->
-  <test test-name="hztest" pkg="rostest" type="hztest">
-    <param name="topic" value="joint_states"/>
-    <param name="hz" value="50"/>
-    <param name="hzerror" value="10"/>
-    <param name="test_duration" value="5.0"/>  
-  </test>
-
-</launch>
diff --git a/fake_joint_launch/package.xml b/fake_joint_launch/package.xml
index 0233e31..8c5abe4 100644
--- a/fake_joint_launch/package.xml
+++ b/fake_joint_launch/package.xml
@@ -27,7 +27,6 @@
   <exec_depend>rviz</exec_depend>
   <exec_depend>tra1_description</exec_depend>
   <exec_depend>ur_description</exec_depend>
-  <exec_depend>vs060</exec_depend>
 
   <export></export>
   

From 3b95d1e6c6b863d3619a92539abee929f9893936 Mon Sep 17 00:00:00 2001
From: Tyler Weaver <tyler@picknik.ai>
Date: Wed, 11 Dec 2019 11:49:47 -0700
Subject: [PATCH 3/5] remove dependencies that are not in melodic

---
 fake_joint_launch/package.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fake_joint_launch/package.xml b/fake_joint_launch/package.xml
index 8c5abe4..8bdd0dc 100644
--- a/fake_joint_launch/package.xml
+++ b/fake_joint_launch/package.xml
@@ -20,12 +20,9 @@
 
   <exec_depend>abb_irb2400_support</exec_depend>
   <exec_depend>controller_manager</exec_depend>
-  <exec_depend>denso_ros_control</exec_depend>
-  <exec_depend>nextage_description</exec_depend>
   <exec_depend>pr2_description</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>rviz</exec_depend>
-  <exec_depend>tra1_description</exec_depend>
   <exec_depend>ur_description</exec_depend>
 
   <export></export>

From 6aa23925e38b69d4a61f14cd03ccca12846bec24 Mon Sep 17 00:00:00 2001
From: Ryosuke Tajima <ryosuke.tajima@opensource-robotics.tokyo.jp>
Date: Wed, 18 Dec 2019 22:07:32 +0900
Subject: [PATCH 4/5] Rename launch files for melodic release

---
 .../launch/{nextage.launch => nextage.launch.kinetic}             | 0
 fake_joint_launch/launch/{tra1.launch => tra1.launch.kinetic}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename fake_joint_launch/launch/{nextage.launch => nextage.launch.kinetic} (100%)
 rename fake_joint_launch/launch/{tra1.launch => tra1.launch.kinetic} (100%)

diff --git a/fake_joint_launch/launch/nextage.launch b/fake_joint_launch/launch/nextage.launch.kinetic
similarity index 100%
rename from fake_joint_launch/launch/nextage.launch
rename to fake_joint_launch/launch/nextage.launch.kinetic
diff --git a/fake_joint_launch/launch/tra1.launch b/fake_joint_launch/launch/tra1.launch.kinetic
similarity index 100%
rename from fake_joint_launch/launch/tra1.launch
rename to fake_joint_launch/launch/tra1.launch.kinetic

From b06b1324819c1a93b52b19952d6d1a0292392fa4 Mon Sep 17 00:00:00 2001
From: Ryosuke Tajima <ryosuke.tajima@opensource-robotics.tokyo.jp>
Date: Wed, 18 Dec 2019 22:27:33 +0900
Subject: [PATCH 5/5] Rename UR related launch files for Melodic release

---
 fake_joint_launch/launch/{ur3.launch => ur3.launch.kinetic} | 0
 fake_joint_launch/launch/{ur5.launch => ur5.launch.kinetic} | 0
 fake_joint_launch/package.xml                               | 1 -
 3 files changed, 1 deletion(-)
 rename fake_joint_launch/launch/{ur3.launch => ur3.launch.kinetic} (100%)
 rename fake_joint_launch/launch/{ur5.launch => ur5.launch.kinetic} (100%)

diff --git a/fake_joint_launch/launch/ur3.launch b/fake_joint_launch/launch/ur3.launch.kinetic
similarity index 100%
rename from fake_joint_launch/launch/ur3.launch
rename to fake_joint_launch/launch/ur3.launch.kinetic
diff --git a/fake_joint_launch/launch/ur5.launch b/fake_joint_launch/launch/ur5.launch.kinetic
similarity index 100%
rename from fake_joint_launch/launch/ur5.launch
rename to fake_joint_launch/launch/ur5.launch.kinetic
diff --git a/fake_joint_launch/package.xml b/fake_joint_launch/package.xml
index 8bdd0dc..4550232 100644
--- a/fake_joint_launch/package.xml
+++ b/fake_joint_launch/package.xml
@@ -23,7 +23,6 @@
   <exec_depend>pr2_description</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>rviz</exec_depend>
-  <exec_depend>ur_description</exec_depend>
 
   <export></export>