From b0994e5e6c7dac694c01a92f050ec573abb5aabf Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Thu, 15 Jul 2021 11:14:47 -0400
Subject: [PATCH 1/3] Switch to package format 3

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 ros2launch/package.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ros2launch/package.xml b/ros2launch/package.xml
index de5f4eb1..5f5d3091 100644
--- a/ros2launch/package.xml
+++ b/ros2launch/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <?xml-model
-  href="http://download.ros.org/schema/package_format2.xsd"
+  href="http://download.ros.org/schema/package_format3.xsd"
   schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<package format="3">
   <name>ros2launch</name>
   <version>0.15.0</version>
   <description>

From fd2b9641efc26df37c074634acd3b2aead3ddaa5 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Thu, 15 Jul 2021 11:16:15 -0400
Subject: [PATCH 2/3] Declare dependency on launch_{xml,yaml} in ros2launch

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 ros2launch/package.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ros2launch/package.xml b/ros2launch/package.xml
index 5f5d3091..7159cb0d 100644
--- a/ros2launch/package.xml
+++ b/ros2launch/package.xml
@@ -21,6 +21,10 @@
   <depend>ros2cli</depend>
   <depend>ros2pkg</depend>
 
+  <!-- explicitly depend on the main launch frontends -->
+  <exec_depend>launch_xml</exec_depend>
+  <exec_depend>launch_yaml</exec_depend>
+
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>

From 66c6d7e81f97598a4065ef4228ffb57a7bbe258d Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Thu, 15 Jul 2021 11:16:39 -0400
Subject: [PATCH 3/3] Declare a 'launch_frontend_packages' group and use in
 ros2launch

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
---
 ros2launch/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ros2launch/package.xml b/ros2launch/package.xml
index 7159cb0d..aacfc849 100644
--- a/ros2launch/package.xml
+++ b/ros2launch/package.xml
@@ -30,6 +30,8 @@
   <test_depend>ament_pep257</test_depend>
   <test_depend>python3-pytest</test_depend>
 
+  <group_depend>launch_frontend_packages</group_depend>
+
   <export>
     <build_type>ament_python</build_type>
   </export>