From f4d94441933ef3819ef18f2a79eee1bee2acb82b Mon Sep 17 00:00:00 2001
From: Kei Okada <k-okada@jsk.t.u-tokyo.ac.jp>
Date: Thu, 10 Nov 2022 20:02:17 +0900
Subject: [PATCH 1/3] jsk_robot_common/jsk_robot_startup/CMakeLists.txt:
 install python code using catkin_install_python

---
 jsk_robot_common/jsk_robot_startup/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jsk_robot_common/jsk_robot_startup/CMakeLists.txt b/jsk_robot_common/jsk_robot_startup/CMakeLists.txt
index a9ca7f482e4..76ce6de0298 100644
--- a/jsk_robot_common/jsk_robot_startup/CMakeLists.txt
+++ b/jsk_robot_common/jsk_robot_startup/CMakeLists.txt
@@ -140,6 +140,14 @@ endif()
 install(DIRECTORY lifelog util launch images config cfg
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS)
+file(GLOB_RECURSE SCRIPT_PROGRAMS lifelog/*)
+foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS})
+  if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$")
+    catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+  else()
+    install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+  endif()
+endforeach()
 
 if(mongodb_store_FOUND)
 install(TARGETS jsk_robot_lifelog

From 40be6fc87b2ac5e4c9efce9c84dca930210730d0 Mon Sep 17 00:00:00 2001
From: Kei Okada <k-okada@jsk.t.u-tokyo.ac.jp>
Date: Thu, 10 Nov 2022 20:24:05 +0900
Subject: [PATCH 2/3] jsk_robot_common/jsk_robot_startup/package.xml updaet to
 packge=3

---
 .../jsk_robot_startup/package.xml             | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/jsk_robot_common/jsk_robot_startup/package.xml b/jsk_robot_common/jsk_robot_startup/package.xml
index c86b879736d..dab761c4767 100644
--- a/jsk_robot_common/jsk_robot_startup/package.xml
+++ b/jsk_robot_common/jsk_robot_startup/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package format="3">
   <name>jsk_robot_startup</name>
   <version>1.1.0</version>
   <description>The jsk_robot_startup package</description>
@@ -19,33 +19,33 @@
   <build_depend>sensor_msgs</build_depend>
   <build_depend>dynamic_reconfigure</build_depend>
   <build_depend>urdf</build_depend>
-  <run_depend>actionlib_msgs</run_depend>
-  <run_depend>app_manager</run_depend>
-  <run_depend>dynamic_reconfigure</run_depend>
-  <run_depend>geometry_msgs</run_depend>
-  <run_depend>gmapping</run_depend>
-  <run_depend>google_chat_ros</run_depend>
-  <run_depend>jsk_recognition_msgs</run_depend>
-  <run_depend version_gte="2.2.7">jsk_topic_tools</run_depend>
-  <run_depend>message_runtime</run_depend>
-  <run_depend>mongodb_store</run_depend>
-  <run_depend>nodelet</run_depend>
-  <run_depend>pointcloud_to_laserscan</run_depend>
-  <run_depend>posedetection_msgs</run_depend>
-  <run_depend>rosbridge_server</run_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>roseus_mongo</run_depend>
-  <run_depend>rosgraph</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>rostwitter</run_depend>
-  <run_depend>roswww</run_depend>
-  <run_depend>sensor_msgs</run_depend>
-  <run_depend>tf</run_depend>
-  <run_depend>tf2_ros</run_depend>
-  <run_depend>tf2_py</run_depend>
-  <run_depend>tf2_geometry_msgs</run_depend>
-  <run_depend>urdf</run_depend>
-  <run_depend>jsk_tilt_laser</run_depend>
+  <exec_depend>actionlib_msgs</exec_depend>
+  <exec_depend>app_manager</exec_depend>
+  <exec_depend>dynamic_reconfigure</exec_depend>
+  <exec_depend>geometry_msgs</exec_depend>
+  <exec_depend>gmapping</exec_depend>
+  <exec_depend>google_chat_ros</exec_depend>
+  <exec_depend>jsk_recognition_msgs</exec_depend>
+  <exec_depend version_gte="2.2.7">jsk_topic_tools</exec_depend>
+  <exec_depend>message_runtime</exec_depend>
+  <exec_depend>mongodb_store</exec_depend>
+  <exec_depend>nodelet</exec_depend>
+  <exec_depend>pointcloud_to_laserscan</exec_depend>
+  <exec_depend>posedetection_msgs</exec_depend>
+  <exec_depend>rosbridge_server</exec_depend>
+  <exec_depend>roscpp</exec_depend>
+  <exec_depend>roseus_mongo</exec_depend>
+  <exec_depend>rosgraph</exec_depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>rostwitter</exec_depend>
+  <exec_depend>roswww</exec_depend>
+  <exec_depend>sensor_msgs</exec_depend>
+  <exec_depend>tf</exec_depend>
+  <exec_depend>tf2_ros</exec_depend>
+  <exec_depend>tf2_py</exec_depend>
+  <exec_depend>tf2_geometry_msgs</exec_depend>
+  <exec_depend>urdf</exec_depend>
+  <exec_depend>jsk_tilt_laser</exec_depend>
 
   <test_depend>rostest</test_depend>
   <test_depend>pr2_gazebo</test_depend>

From 7ed2a5a76ad0695825d74b59a6e64f0f2fb26d73 Mon Sep 17 00:00:00 2001
From: Kei Okada <k-okada@jsk.t.u-tokyo.ac.jp>
Date: Thu, 10 Nov 2022 20:04:08 +0900
Subject: [PATCH 3/3] jsk_robot_startup/package.xml: update to version 3, add
 python3-* packages to exec_depend

---
 jsk_robot_common/jsk_robot_startup/package.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jsk_robot_common/jsk_robot_startup/package.xml b/jsk_robot_common/jsk_robot_startup/package.xml
index dab761c4767..8b1e644b857 100644
--- a/jsk_robot_common/jsk_robot_startup/package.xml
+++ b/jsk_robot_common/jsk_robot_startup/package.xml
@@ -32,6 +32,12 @@
   <exec_depend>nodelet</exec_depend>
   <exec_depend>pointcloud_to_laserscan</exec_depend>
   <exec_depend>posedetection_msgs</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-bson</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-bson</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-pymongo</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-pymongo</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-tz</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-tz</exec_depend>
   <exec_depend>rosbridge_server</exec_depend>
   <exec_depend>roscpp</exec_depend>
   <exec_depend>roseus_mongo</exec_depend>