From f96759262c3209e34242d7e616c272828af259f4 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Thu, 30 Aug 2018 00:21:22 +0900
Subject: [PATCH 1/2] replace xacro.py to xacro --inorder

---
 ind_cal_multi_camera/launch/calibrate_from_images.launch | 2 +-
 ind_cal_multi_camera/launch/camera_scene_cal.launch      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ind_cal_multi_camera/launch/calibrate_from_images.launch b/ind_cal_multi_camera/launch/calibrate_from_images.launch
index e47e01b..6821d71 100644
--- a/ind_cal_multi_camera/launch/calibrate_from_images.launch
+++ b/ind_cal_multi_camera/launch/calibrate_from_images.launch
@@ -25,7 +25,7 @@
    </node> 
 
    <!-- Load the xacro file of the tower and cameras onto the parameter server as a robot description -->
-   <param name="$(arg robot1)/robot_description" command="$(find xacro)/xacro.py $(arg tower1_model)" />
+   <param name="$(arg robot1)/robot_description" command="$(find xacro)/xacro --inorder $(arg tower1_model)" />
    <param name="use_gui" value="$(arg gui)" />
 
    <!-- Launch robot state publishers for both towers -->
diff --git a/ind_cal_multi_camera/launch/camera_scene_cal.launch b/ind_cal_multi_camera/launch/camera_scene_cal.launch
index e8695cc..2414e94 100644
--- a/ind_cal_multi_camera/launch/camera_scene_cal.launch
+++ b/ind_cal_multi_camera/launch/camera_scene_cal.launch
@@ -60,7 +60,7 @@
    </node> 
 
    <!-- Load the xacro file of the tower and cameras onto the parameter server as a robot description -->
-   <param name="$(arg robot1)/robot_description" command="$(find xacro)/xacro.py $(arg xacro_model)" />
+   <param name="$(arg robot1)/robot_description" command="$(find xacro)/xacro --inorder $(arg xacro_model)" />
    <param name="use_gui" value="$(arg gui)" />
 
    <!-- Launch robot state publishers for scene -->

From f6d00ecd7a438ea3981e8e46b6f9a5c4024aa9d5 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Thu, 30 Aug 2018 00:30:58 +0900
Subject: [PATCH 2/2] replace also gen_rrdf.sh

---
 ind_cal_multi_camera/urdf/gen_urdf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ind_cal_multi_camera/urdf/gen_urdf.sh b/ind_cal_multi_camera/urdf/gen_urdf.sh
index 62537cc..f2ea946 100755
--- a/ind_cal_multi_camera/urdf/gen_urdf.sh
+++ b/ind_cal_multi_camera/urdf/gen_urdf.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rosrun xacro xacro.py camera_scene.xacro > camera_scene.urdf
+rosrun xacro xacro --inorder camera_scene.xacro > camera_scene.urdf