From 3db1c43eaf291f1544b0d50b9d1086ec02797369 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Mon, 18 Mar 2024 16:36:04 -0500
Subject: [PATCH 1/3] Add package.xml

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/workflows/package_xml.yml | 20 ++++++++++++++++++++
 package.xml                       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 .github/workflows/package_xml.yml
 create mode 100644 package.xml

diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
new file mode 100644
index 00000000..5b5c6d88
--- /dev/null
+++ b/.github/workflows/package_xml.yml
@@ -0,0 +1,20 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: package.xml and CMake versions match
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Check versions
+        run: |
+          echo "Extract version numbers and compare"
+          package_xml_version=$(sed -nE 's/\s*<version>([0-9.]*)<\/version>\s*/\1/p' package.xml)
+          echo "Version in package.xml: ${package_xml_version}"
+          cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt)
+          echo "Version in CMake: ${cmake_version}"
+          [ $package_xml_version = $cmake_version ]
diff --git a/package.xml b/package.xml
new file mode 100644
index 00000000..921fc6bf
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>gz-fuel-tools9</name>
+  <version>9.0.2</version>
+  <description>Gazebo Fuel Tools: Classes and tools for interacting with Gazebo Fuel</description>
+  <maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>
+  <license>Apache License 2.0</license>
+  <url type="website">https://github.com/gazebosim/gz-fuel-tools</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <build_depend>gz-cmake3</build_depend>
+
+  <depend>gz-common5</depend>
+  <depend>gz-math7</depend>
+  <depend>gz-msgs10</depend>
+  <depend>gz-tools2</depend>
+  <depend>gz-utils2</depend>
+  <depend>libcurl-dev</depend>
+  <depend>libgflags-dev</depend>
+  <depend>libjsoncpp-dev</depend>
+  <depend>libyaml-dev</depend>
+  <depend>libzip-dev</depend>
+  <depend>tinyxml2</depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>

From d9c78a8c6c4d7c6b8c5205263d5dcbd86f498ab5 Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Fri, 19 Apr 2024 15:23:51 -0500
Subject: [PATCH 2/3] Update version, use package.xml validation action

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/workflows/package_xml.yml | 13 ++-----------
 package.xml                       |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
index 5b5c6d88..4bd4a9aa 100644
--- a/.github/workflows/package_xml.yml
+++ b/.github/workflows/package_xml.yml
@@ -6,15 +6,6 @@ on:
 jobs:
   package-xml:
     runs-on: ubuntu-latest
-    name: package.xml and CMake versions match
+    name: Validate package.xml
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Check versions
-        run: |
-          echo "Extract version numbers and compare"
-          package_xml_version=$(sed -nE 's/\s*<version>([0-9.]*)<\/version>\s*/\1/p' package.xml)
-          echo "Version in package.xml: ${package_xml_version}"
-          cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt)
-          echo "Version in CMake: ${cmake_version}"
-          [ $package_xml_version = $cmake_version ]
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
diff --git a/package.xml b/package.xml
index 921fc6bf..4ed959ef 100644
--- a/package.xml
+++ b/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>gz-fuel-tools9</name>
-  <version>9.0.2</version>
+  <version>9.0.3</version>
   <description>Gazebo Fuel Tools: Classes and tools for interacting with Gazebo Fuel</description>
   <maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>
   <license>Apache License 2.0</license>

From 82ceb95ad52c9660dbf15f0a1f781113aab7912c Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Tue, 23 Apr 2024 19:26:40 -0500
Subject: [PATCH 3/3] Match name to CMake project name

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.xml b/package.xml
index 4ed959ef..38697e63 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-fuel-tools9</name>
+  <name>gz-fuel_tools9</name>
   <version>9.0.3</version>
   <description>Gazebo Fuel Tools: Classes and tools for interacting with Gazebo Fuel</description>
   <maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>