From d8cf74126ed5fd53808589c12b1d316bee47fe32 Mon Sep 17 00:00:00 2001
From: Arne Hitzmann <arne.hitzmann@gmail.com>
Date: Sat, 4 Mar 2023 13:08:15 +0900
Subject: [PATCH 1/2] updated package.xml to format version 3

---
 gazebo_plugins/package.xml | 2 +-
 gazebo_ros/package.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gazebo_plugins/package.xml b/gazebo_plugins/package.xml
index b0b393cad..bf8624786 100644
--- a/gazebo_plugins/package.xml
+++ b/gazebo_plugins/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>gazebo_plugins</name>
   <version>2.9.2</version>
   <description>
diff --git a/gazebo_ros/package.xml b/gazebo_ros/package.xml
index fc738372a..6eeb3b8d3 100644
--- a/gazebo_ros/package.xml
+++ b/gazebo_ros/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>gazebo_ros</name>
   <version>2.9.2</version>
   <description>

From 81d9c0477cafe1bff26d13742372a5c3da759e7d Mon Sep 17 00:00:00 2001
From: Arne Hitzmann <arne.hitzmann@gmail.com>
Date: Sat, 4 Mar 2023 13:10:18 +0900
Subject: [PATCH 2/2] change to setuptools in accordance with migration guide

---
 gazebo_plugins/package.xml | 3 ++-
 gazebo_plugins/setup.py    | 2 +-
 gazebo_ros/package.xml     | 2 ++
 gazebo_ros/setup.py        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gazebo_plugins/package.xml b/gazebo_plugins/package.xml
index bf8624786..7cdb7406e 100644
--- a/gazebo_plugins/package.xml
+++ b/gazebo_plugins/package.xml
@@ -18,7 +18,8 @@
   <author>John Hsu</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
   <build_depend>gazebo_dev</build_depend>
   <!--
     Need to use gazebo_dev since run script needs pkg-config
diff --git a/gazebo_plugins/setup.py b/gazebo_plugins/setup.py
index 2bb982c7c..1dc23a6a6 100644
--- a/gazebo_plugins/setup.py
+++ b/gazebo_plugins/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup()
diff --git a/gazebo_ros/package.xml b/gazebo_ros/package.xml
index 6eeb3b8d3..929e83c70 100644
--- a/gazebo_ros/package.xml
+++ b/gazebo_ros/package.xml
@@ -21,6 +21,8 @@
   <author>Dave Coleman</author>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
   <build_depend>cmake_modules</build_depend>
   <build_depend>gazebo_dev</build_depend>
diff --git a/gazebo_ros/setup.py b/gazebo_ros/setup.py
index b437c4346..ea9c74554 100644
--- a/gazebo_ros/setup.py
+++ b/gazebo_ros/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup()