From c2d16388c6a54aefc93aec04be5645c95f339346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 17:19:14 -0700
Subject: [PATCH 01/10] Reformat with sed script.

    s/^((Package/(Package/
    s/^Package/ Package/
    s/Package (% =/Package (= /
    s/^\$Version/), $Version/
    s/)), /) /
    s/)) |/) |/
---
 ...nition_citadel_gazebo11_debian_buster.yaml | 260 +++++++++---------
 ...gnition_citadel_gazebo11_ubuntu_focal.yaml | 260 +++++++++---------
 2 files changed, 260 insertions(+), 260 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_debian_buster.yaml b/config/ignition_citadel_gazebo11_debian_buster.yaml
index aaf6f6b8..a35f08d4 100644
--- a/config/ignition_citadel_gazebo11_debian_buster.yaml
+++ b/config/ignition_citadel_gazebo11_debian_buster.yaml
@@ -4,134 +4,134 @@ suites: [buster]
 component: main
 architectures: [amd64, i386, armhf, arm64, source]
 filter_formula: "\
-((Package (% =gazebo11) |\
-Package (% =gazebo11-common) |\
-Package (% =gazebo11-dbg) |\
-Package (% =gazebo11-doc) |\
-Package (% =gazebo11-plugin-base) |\
-Package (% =libgazebo11) |\
-Package (% =libgazebo11-dev)), \
-$Version (% 11.9.0-1~*)) |\
-((Package (% =ignition-cmake2) |\
-Package (% =libignition-cmake2-dev)), \
-$Version (% 2.9.0-1~*)) |\
-(Package (% =ignition-citadel), $Version (% 1.0.2*))|\
-((Package (% =ignition-common3) |\
-Package (% =libignition-common3) |\
-Package (% =libignition-common3-av) |\
-Package (% =libignition-common3-av-dev) |\
-Package (% =libignition-common3-core-dev) |\
-Package (% =libignition-common3-dev) |\
-Package (% =libignition-common3-events) |\
-Package (% =libignition-common3-events-dev) |\
-Package (% =libignition-common3-graphics) |\
-Package (% =libignition-common3-graphics-dev) |\
-Package (% =libignition-common3-profiler) |\
-Package (% =libignition-common3-profiler-dev)), \
-$Version (% 3.14.0-1~*)) |\
-((Package (% =ignition-fuel-tools4) |\
-Package (% =libignition-fuel-tools4) |\
-Package (% =libignition-fuel-tools4-dev)), \
-$Version (% 4.4.0-1~*)) |\
-((Package (% =ignition-gazebo3) |\
-Package (% =libignition-gazebo3) |\
-Package (% =libignition-gazebo3-dev) |\
-Package (% =libignition-gazebo3-plugins)), \
-$Version (% 3.12.0-1~*)) |\
-((Package (% =ignition-gui3) |\
-Package (% =libignition-gui3) |\
-Package (% =libignition-gui3-dev)), \
-$Version (% 3.8.0-1~*)) |\
-((Package (% =ignition-launch2) |\
-Package (% =libignition-launch2) |\
-Package (% =libignition-launch2-dev)), \
-$Version (% 2.2.2-1~*)) |\
-((Package (% =ignition-math6) |\
-Package (% =libignition-math6) |\
-Package (% =libignition-math6-dbg) |\
-Package (% =libignition-math6-dev) |\
-Package (% =libignition-math6-eigen3-dev)), \
-$Version (% 6.9.2-1~*)) |\
-((Package (% =ignition-msgs5) |\
-Package (% =libignition-msgs5) |\
-Package (% =libignition-msgs5-dev) |\
-Package (% =libignition-msgs5-dbg)), \
-$Version (% 5.8.1-1~*)) |\
-((Package (% =ignition-physics2) |\
-Package (% =libignition-physics2) |\
-Package (% =libignition-physics2-core-dev) |\
-Package (% =libignition-physics2-dartsim) |\
-Package (% =libignition-physics2-dartsim-dev) |\
-Package (% =libignition-physics2-dev) |\
-Package (% =libignition-physics2-mesh-dev) |\
-Package (% =libignition-physics2-sdf-dev) |\
-Package (% =libignition-physics2-tpe) |\
-Package (% =libignition-physics2-tpe-dev) |\
-Package (% =libignition-physics2-tpelib) |\
-Package (% =libignition-physics2-tpelib-dev)), \
-$Version (% 2.5.0-1~*)) |\
-((Package (% =ignition-plugin) |\
-Package (% =libignition-plugin) |\
-Package (% =libignition-plugin-dev)), \
-$Version (% 1.2.1-1~*)) |\
-((Package (% =ignition-rendering3) |\
-Package (% =libignition-rendering3) |\
-Package (% =libignition-rendering3-core-dev) |\
-Package (% =libignition-rendering3-dev) |\
-Package (% =libignition-rendering3-ogre1) |\
-Package (% =libignition-rendering3-ogre1-dev) |\
-Package (% =libignition-rendering3-ogre2) |\
-Package (% =libignition-rendering3-ogre2-dev)), \
-$Version (% 3.6.0-1~*)) |\
-((Package (% =ignition-sensors3) |\
-Package (% =libignition-sensors3) |\
-Package (% =libignition-sensors3-air-pressure) |\
-Package (% =libignition-sensors3-air-pressure-dev) |\
-Package (% =libignition-sensors3-altimeter) |\
-Package (% =libignition-sensors3-altimeter-dev) |\
-Package (% =libignition-sensors3-camera) |\
-Package (% =libignition-sensors3-camera-dev) |\
-Package (% =libignition-sensors3-core-dev) |\
-Package (% =libignition-sensors3-depth-camera) |\
-Package (% =libignition-sensors3-depth-camera-dev) |\
-Package (% =libignition-sensors3-dev) |\
-Package (% =libignition-sensors3-gpu-lidar) |\
-Package (% =libignition-sensors3-gpu-lidar-dev) |\
-Package (% =libignition-sensors3-imu) |\
-Package (% =libignition-sensors3-imu-dev) |\
-Package (% =libignition-sensors3-lidar) |\
-Package (% =libignition-sensors3-lidar-dev) |\
-Package (% =libignition-sensors3-logical-camera) |\
-Package (% =libignition-sensors3-logical-camera-dev) |\
-Package (% =libignition-sensors3-magnetometer) |\
-Package (% =libignition-sensors3-magnetometer-dev) |\
-Package (% =libignition-sensors3-rendering) |\
-Package (% =libignition-sensors3-rendering-dev) |\
-Package (% =libignition-sensors3-rgbd-camera) |\
-Package (% =libignition-sensors3-rgbd-camera-dev) |\
-Package (% =libignition-sensors3-thermal-camera) |\
-Package (% =libignition-sensors3-thermal-camera-dev)), \
-$Version (% 3.3.0-1~*)) |\
-((Package (% =ignition-tools) |\
-Package (% =libignition-tools-dev)), \
-$Version (% 1.4.1-1~*)) |\
-((Package (% =ignition-transport8) |\
-Package (% =libignition-transport8) |\
-Package (% =libignition-transport8-core-dev) |\
-Package (% =libignition-transport8-dbg) |\
-Package (% =libignition-transport8-dev) |\
-Package (% =libignition-transport8-log) |\
-Package (% =libignition-transport8-log-dev)), \
-$Version (% 8.2.1-1~*)) |\
-((Package (% =ogre-2.1) |\
-Package (% =libogre-2.1) |\
-Package (% =libogre-2.1-dev)),
-$Version (% 2.0.9999~20180616~06a386f-3osrf~*)) |\
-((Package (% =sdformat9) |\
-Package (% =libsdformat9) |\
-Package (% =libsdformat9-dbg) |\
-Package (% =libsdformat9-dev) |\
-Package (% =sdformat9-doc) |\
-Package (% =sdformat9-sdf)), \
-$Version (% 9.7.0-1~*)) \
+(Package (= gazebo11) |\
+ Package (= gazebo11-common) |\
+ Package (= gazebo11-dbg) |\
+ Package (= gazebo11-doc) |\
+ Package (= gazebo11-plugin-base) |\
+ Package (= libgazebo11) |\
+ Package (= libgazebo11-dev) \
+), $Version (% 11.9.0-1~*) |\
+(Package (= ignition-cmake2) |\
+ Package (= libignition-cmake2-dev) \
+), $Version (% 2.9.0-1~*) |\
+(Package (= ignition-citadel), $Version (% 1.0.2*))|\
+(Package (= ignition-common3) |\
+ Package (= libignition-common3) |\
+ Package (= libignition-common3-av) |\
+ Package (= libignition-common3-av-dev) |\
+ Package (= libignition-common3-core-dev) |\
+ Package (= libignition-common3-dev) |\
+ Package (= libignition-common3-events) |\
+ Package (= libignition-common3-events-dev) |\
+ Package (= libignition-common3-graphics) |\
+ Package (= libignition-common3-graphics-dev) |\
+ Package (= libignition-common3-profiler) |\
+ Package (= libignition-common3-profiler-dev) \
+), $Version (% 3.14.0-1~*) |\
+(Package (= ignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4-dev) \
+), $Version (% 4.4.0-1~*) |\
+(Package (= ignition-gazebo3) |\
+ Package (= libignition-gazebo3) |\
+ Package (= libignition-gazebo3-dev) |\
+ Package (= libignition-gazebo3-plugins) \
+), $Version (% 3.12.0-1~*) |\
+(Package (= ignition-gui3) |\
+ Package (= libignition-gui3) |\
+ Package (= libignition-gui3-dev) \
+), $Version (% 3.8.0-1~*) |\
+(Package (= ignition-launch2) |\
+ Package (= libignition-launch2) |\
+ Package (= libignition-launch2-dev) \
+), $Version (% 2.2.2-1~*) |\
+(Package (= ignition-math6) |\
+ Package (= libignition-math6) |\
+ Package (= libignition-math6-dbg) |\
+ Package (= libignition-math6-dev) |\
+ Package (= libignition-math6-eigen3-dev) \
+), $Version (% 6.9.2-1~*) |\
+(Package (= ignition-msgs5) |\
+ Package (= libignition-msgs5) |\
+ Package (= libignition-msgs5-dev) |\
+ Package (= libignition-msgs5-dbg) \
+), $Version (% 5.8.1-1~*) |\
+(Package (= ignition-physics2) |\
+ Package (= libignition-physics2) |\
+ Package (= libignition-physics2-core-dev) |\
+ Package (= libignition-physics2-dartsim) |\
+ Package (= libignition-physics2-dartsim-dev) |\
+ Package (= libignition-physics2-dev) |\
+ Package (= libignition-physics2-mesh-dev) |\
+ Package (= libignition-physics2-sdf-dev) |\
+ Package (= libignition-physics2-tpe) |\
+ Package (= libignition-physics2-tpe-dev) |\
+ Package (= libignition-physics2-tpelib) |\
+ Package (= libignition-physics2-tpelib-dev) \
+), $Version (% 2.5.0-1~*) |\
+(Package (= ignition-plugin) |\
+ Package (= libignition-plugin) |\
+ Package (= libignition-plugin-dev) \
+), $Version (% 1.2.1-1~*) |\
+(Package (= ignition-rendering3) |\
+ Package (= libignition-rendering3) |\
+ Package (= libignition-rendering3-core-dev) |\
+ Package (= libignition-rendering3-dev) |\
+ Package (= libignition-rendering3-ogre1) |\
+ Package (= libignition-rendering3-ogre1-dev) |\
+ Package (= libignition-rendering3-ogre2) |\
+ Package (= libignition-rendering3-ogre2-dev) \
+), $Version (% 3.6.0-1~*) |\
+(Package (= ignition-sensors3) |\
+ Package (= libignition-sensors3) |\
+ Package (= libignition-sensors3-air-pressure) |\
+ Package (= libignition-sensors3-air-pressure-dev) |\
+ Package (= libignition-sensors3-altimeter) |\
+ Package (= libignition-sensors3-altimeter-dev) |\
+ Package (= libignition-sensors3-camera) |\
+ Package (= libignition-sensors3-camera-dev) |\
+ Package (= libignition-sensors3-core-dev) |\
+ Package (= libignition-sensors3-depth-camera) |\
+ Package (= libignition-sensors3-depth-camera-dev) |\
+ Package (= libignition-sensors3-dev) |\
+ Package (= libignition-sensors3-gpu-lidar) |\
+ Package (= libignition-sensors3-gpu-lidar-dev) |\
+ Package (= libignition-sensors3-imu) |\
+ Package (= libignition-sensors3-imu-dev) |\
+ Package (= libignition-sensors3-lidar) |\
+ Package (= libignition-sensors3-lidar-dev) |\
+ Package (= libignition-sensors3-logical-camera) |\
+ Package (= libignition-sensors3-logical-camera-dev) |\
+ Package (= libignition-sensors3-magnetometer) |\
+ Package (= libignition-sensors3-magnetometer-dev) |\
+ Package (= libignition-sensors3-rendering) |\
+ Package (= libignition-sensors3-rendering-dev) |\
+ Package (= libignition-sensors3-rgbd-camera) |\
+ Package (= libignition-sensors3-rgbd-camera-dev) |\
+ Package (= libignition-sensors3-thermal-camera) |\
+ Package (= libignition-sensors3-thermal-camera-dev) \
+), $Version (% 3.3.0-1~*) |\
+(Package (= ignition-tools) |\
+ Package (= libignition-tools-dev) \
+), $Version (% 1.4.1-1~*) |\
+(Package (= ignition-transport8) |\
+ Package (= libignition-transport8) |\
+ Package (= libignition-transport8-core-dev) |\
+ Package (= libignition-transport8-dbg) |\
+ Package (= libignition-transport8-dev) |\
+ Package (= libignition-transport8-log) |\
+ Package (= libignition-transport8-log-dev) \
+), $Version (% 8.2.1-1~*) |\
+(Package (= ogre-2.1) |\
+ Package (= libogre-2.1) |\
+ Package (= libogre-2.1-dev)),
+), $Version (% 2.0.9999~20180616~06a386f-3osrf~*) |\
+(Package (= sdformat9) |\
+ Package (= libsdformat9) |\
+ Package (= libsdformat9-dbg) |\
+ Package (= libsdformat9-dev) |\
+ Package (= sdformat9-doc) |\
+ Package (= sdformat9-sdf) \
+), $Version (% 9.7.0-1~*)) \
 "
diff --git a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
index 8b3667a1..aea8c624 100644
--- a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
+++ b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
@@ -4,134 +4,134 @@ suites: [focal]
 component: main
 architectures: [amd64, i386, armhf, arm64, source]
 filter_formula: "\
-((Package (% =gazebo11) |\
-Package (% =gazebo11-common) |\
-Package (% =gazebo11-dbg) |\
-Package (% =gazebo11-doc) |\
-Package (% =gazebo11-plugin-base) |\
-Package (% =libgazebo11) |\
-Package (% =libgazebo11-dev)), \
-$Version (% 11.9.0-1~*)) |\
-((Package (% =ignition-cmake2) |\
-Package (% =libignition-cmake2-dev)), \
-$Version (% 2.9.0-1~*)) |\
-(Package (% =ignition-citadel), $Version (% 1.0.2*))|\
-((Package (% =ignition-common3) |\
-Package (% =libignition-common3) |\
-Package (% =libignition-common3-av) |\
-Package (% =libignition-common3-av-dev) |\
-Package (% =libignition-common3-core-dev) |\
-Package (% =libignition-common3-dev) |\
-Package (% =libignition-common3-events) |\
-Package (% =libignition-common3-events-dev) |\
-Package (% =libignition-common3-graphics) |\
-Package (% =libignition-common3-graphics-dev) |\
-Package (% =libignition-common3-profiler) |\
-Package (% =libignition-common3-profiler-dev)), \
-$Version (% 3.14.0-1~*)) |\
-((Package (% =ignition-fuel-tools4) |\
-Package (% =libignition-fuel-tools4) |\
-Package (% =libignition-fuel-tools4-dev)), \
-$Version (% 4.4.0-1~*)) |\
-((Package (% =ignition-gazebo3) |\
-Package (% =libignition-gazebo3) |\
-Package (% =libignition-gazebo3-dev) |\
-Package (% =libignition-gazebo3-plugins)), \
-$Version (% 3.12.0-1~*)) |\
-((Package (% =ignition-gui3) |\
-Package (% =libignition-gui3) |\
-Package (% =libignition-gui3-dev)), \
-$Version (% 3.8.0-1~*)) |\
-((Package (% =ignition-launch2) |\
-Package (% =libignition-launch2) |\
-Package (% =libignition-launch2-dev)), \
-$Version (% 2.2.2-1~*)) |\
-((Package (% =ignition-math6) |\
-Package (% =libignition-math6) |\
-Package (% =libignition-math6-dbg) |\
-Package (% =libignition-math6-dev) |\
-Package (% =libignition-math6-eigen3-dev)), \
-$Version (% 6.9.2-1~*)) |\
-((Package (% =ignition-msgs5) |\
-Package (% =libignition-msgs5) |\
-Package (% =libignition-msgs5-dev) |\
-Package (% =libignition-msgs5-dbg)), \
-$Version (% 5.8.1-1~*)) |\
-((Package (% =ignition-physics2) |\
-Package (% =libignition-physics2) |\
-Package (% =libignition-physics2-core-dev) |\
-Package (% =libignition-physics2-dartsim) |\
-Package (% =libignition-physics2-dartsim-dev) |\
-Package (% =libignition-physics2-dev) |\
-Package (% =libignition-physics2-mesh-dev) |\
-Package (% =libignition-physics2-sdf-dev) |\
-Package (% =libignition-physics2-tpe) |\
-Package (% =libignition-physics2-tpe-dev) |\
-Package (% =libignition-physics2-tpelib) |\
-Package (% =libignition-physics2-tpelib-dev)), \
-$Version (% 2.5.0-1~*)) |\
-((Package (% =ignition-plugin) |\
-Package (% =libignition-plugin) |\
-Package (% =libignition-plugin-dev)), \
-$Version (% 1.2.1-1~*)) |\
-((Package (% =ignition-rendering3) |\
-Package (% =libignition-rendering3) |\
-Package (% =libignition-rendering3-core-dev) |\
-Package (% =libignition-rendering3-dev) |\
-Package (% =libignition-rendering3-ogre1) |\
-Package (% =libignition-rendering3-ogre1-dev) |\
-Package (% =libignition-rendering3-ogre2) |\
-Package (% =libignition-rendering3-ogre2-dev)), \
-$Version (% 3.6.0-1~*)) |\
-((Package (% =ignition-sensors3) |\
-Package (% =libignition-sensors3) |\
-Package (% =libignition-sensors3-air-pressure) |\
-Package (% =libignition-sensors3-air-pressure-dev) |\
-Package (% =libignition-sensors3-altimeter) |\
-Package (% =libignition-sensors3-altimeter-dev) |\
-Package (% =libignition-sensors3-camera) |\
-Package (% =libignition-sensors3-camera-dev) |\
-Package (% =libignition-sensors3-core-dev) |\
-Package (% =libignition-sensors3-depth-camera) |\
-Package (% =libignition-sensors3-depth-camera-dev) |\
-Package (% =libignition-sensors3-dev) |\
-Package (% =libignition-sensors3-gpu-lidar) |\
-Package (% =libignition-sensors3-gpu-lidar-dev) |\
-Package (% =libignition-sensors3-imu) |\
-Package (% =libignition-sensors3-imu-dev) |\
-Package (% =libignition-sensors3-lidar) |\
-Package (% =libignition-sensors3-lidar-dev) |\
-Package (% =libignition-sensors3-logical-camera) |\
-Package (% =libignition-sensors3-logical-camera-dev) |\
-Package (% =libignition-sensors3-magnetometer) |\
-Package (% =libignition-sensors3-magnetometer-dev) |\
-Package (% =libignition-sensors3-rendering) |\
-Package (% =libignition-sensors3-rendering-dev) |\
-Package (% =libignition-sensors3-rgbd-camera) |\
-Package (% =libignition-sensors3-rgbd-camera-dev) |\
-Package (% =libignition-sensors3-thermal-camera) |\
-Package (% =libignition-sensors3-thermal-camera-dev)), \
-$Version (% 3.3.0-1~*)) |\
-((Package (% =ignition-tools) |\
-Package (% =libignition-tools-dev)), \
-$Version (% 1.4.1-1~*)) |\
-((Package (% =ignition-transport8) |\
-Package (% =libignition-transport8) |\
-Package (% =libignition-transport8-core-dev) |\
-Package (% =libignition-transport8-dbg) |\
-Package (% =libignition-transport8-dev) |\
-Package (% =libignition-transport8-log) |\
-Package (% =libignition-transport8-log-dev)), \
-$Version (% 8.2.1-1~*)) |\
-((Package (% =ogre-2.1) |\
-Package (% =libogre-2.1) |\
-Package (% =libogre-2.1-dev)),
-$Version (% 2.0.9999~20180616~06a386f-3osrf~*)) |\
-((Package (% =sdformat9) |\
-Package (% =libsdformat9) |\
-Package (% =libsdformat9-dbg) |\
-Package (% =libsdformat9-dev) |\
-Package (% =sdformat9-doc) |\
-Package (% =sdformat9-sdf)), \
-$Version (% 9.7.0-1~*)) \
+(Package (= gazebo11) |\
+ Package (= gazebo11-common) |\
+ Package (= gazebo11-dbg) |\
+ Package (= gazebo11-doc) |\
+ Package (= gazebo11-plugin-base) |\
+ Package (= libgazebo11) |\
+ Package (= libgazebo11-dev) \
+), $Version (% 11.9.0-1~*)) |\
+(Package (= ignition-cmake2) |\
+ Package (= libignition-cmake2-dev) \
+), $Version (% 2.9.0-1~*)) |\
+(Package (= ignition-citadel), ), $Version (% 1.0.2*))|\
+(Package (= ignition-common3) |\
+ Package (= libignition-common3) |\
+ Package (= libignition-common3-av) |\
+ Package (= libignition-common3-av-dev) |\
+ Package (= libignition-common3-core-dev) |\
+ Package (= libignition-common3-dev) |\
+ Package (= libignition-common3-events) |\
+ Package (= libignition-common3-events-dev) |\
+ Package (= libignition-common3-graphics) |\
+ Package (= libignition-common3-graphics-dev) |\
+ Package (= libignition-common3-profiler) |\
+ Package (= libignition-common3-profiler-dev) \
+), $Version (% 3.14.0-1~*)) |\
+(Package (= ignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4-dev) \
+), $Version (% 4.4.0-1~*)) |\
+(Package (= ignition-gazebo3) |\
+ Package (= libignition-gazebo3) |\
+ Package (= libignition-gazebo3-dev) |\
+ Package (= libignition-gazebo3-plugins) \
+), $Version (% 3.12.0-1~*)) |\
+(Package (= ignition-gui3) |\
+ Package (= libignition-gui3) |\
+ Package (= libignition-gui3-dev) \
+), $Version (% 3.8.0-1~*)) |\
+(Package (= ignition-launch2) |\
+ Package (= libignition-launch2) |\
+ Package (= libignition-launch2-dev) \
+), $Version (% 2.2.2-1~*)) |\
+(Package (= ignition-math6) |\
+ Package (= libignition-math6) |\
+ Package (= libignition-math6-dbg) |\
+ Package (= libignition-math6-dev) |\
+ Package (= libignition-math6-eigen3-dev) \
+), $Version (% 6.9.2-1~*)) |\
+(Package (= ignition-msgs5) |\
+ Package (= libignition-msgs5) |\
+ Package (= libignition-msgs5-dev) |\
+ Package (= libignition-msgs5-dbg) \
+), $Version (% 5.8.1-1~*)) |\
+(Package (= ignition-physics2) |\
+ Package (= libignition-physics2) |\
+ Package (= libignition-physics2-core-dev) |\
+ Package (= libignition-physics2-dartsim) |\
+ Package (= libignition-physics2-dartsim-dev) |\
+ Package (= libignition-physics2-dev) |\
+ Package (= libignition-physics2-mesh-dev) |\
+ Package (= libignition-physics2-sdf-dev) |\
+ Package (= libignition-physics2-tpe) |\
+ Package (= libignition-physics2-tpe-dev) |\
+ Package (= libignition-physics2-tpelib) |\
+ Package (= libignition-physics2-tpelib-dev) \
+), $Version (% 2.5.0-1~*)) |\
+(Package (= ignition-plugin) |\
+ Package (= libignition-plugin) |\
+ Package (= libignition-plugin-dev) \
+), $Version (% 1.2.1-1~*)) |\
+(Package (= ignition-rendering3) |\
+ Package (= libignition-rendering3) |\
+ Package (= libignition-rendering3-core-dev) |\
+ Package (= libignition-rendering3-dev) |\
+ Package (= libignition-rendering3-ogre1) |\
+ Package (= libignition-rendering3-ogre1-dev) |\
+ Package (= libignition-rendering3-ogre2) |\
+ Package (= libignition-rendering3-ogre2-dev) \
+), $Version (% 3.6.0-1~*)) |\
+(Package (= ignition-sensors3) |\
+ Package (= libignition-sensors3) |\
+ Package (= libignition-sensors3-air-pressure) |\
+ Package (= libignition-sensors3-air-pressure-dev) |\
+ Package (= libignition-sensors3-altimeter) |\
+ Package (= libignition-sensors3-altimeter-dev) |\
+ Package (= libignition-sensors3-camera) |\
+ Package (= libignition-sensors3-camera-dev) |\
+ Package (= libignition-sensors3-core-dev) |\
+ Package (= libignition-sensors3-depth-camera) |\
+ Package (= libignition-sensors3-depth-camera-dev) |\
+ Package (= libignition-sensors3-dev) |\
+ Package (= libignition-sensors3-gpu-lidar) |\
+ Package (= libignition-sensors3-gpu-lidar-dev) |\
+ Package (= libignition-sensors3-imu) |\
+ Package (= libignition-sensors3-imu-dev) |\
+ Package (= libignition-sensors3-lidar) |\
+ Package (= libignition-sensors3-lidar-dev) |\
+ Package (= libignition-sensors3-logical-camera) |\
+ Package (= libignition-sensors3-logical-camera-dev) |\
+ Package (= libignition-sensors3-magnetometer) |\
+ Package (= libignition-sensors3-magnetometer-dev) |\
+ Package (= libignition-sensors3-rendering) |\
+ Package (= libignition-sensors3-rendering-dev) |\
+ Package (= libignition-sensors3-rgbd-camera) |\
+ Package (= libignition-sensors3-rgbd-camera-dev) |\
+ Package (= libignition-sensors3-thermal-camera) |\
+ Package (= libignition-sensors3-thermal-camera-dev) \
+), $Version (% 3.3.0-1~*)) |\
+(Package (= ignition-tools) |\
+ Package (= libignition-tools-dev) \
+), $Version (% 1.4.1-1~*)) |\
+(Package (= ignition-transport8) |\
+ Package (= libignition-transport8) |\
+ Package (= libignition-transport8-core-dev) |\
+ Package (= libignition-transport8-dbg) |\
+ Package (= libignition-transport8-dev) |\
+ Package (= libignition-transport8-log) |\
+ Package (= libignition-transport8-log-dev) \
+), $Version (% 8.2.1-1~*)) |\
+(Package (= ogre-2.1) |\
+ Package (= libogre-2.1) |\
+ Package (= libogre-2.1-dev)),
+), $Version (% 2.0.9999~20180616~06a386f-3osrf~*)) |\
+(Package (= sdformat9) |\
+ Package (= libsdformat9) |\
+ Package (= libsdformat9-dbg) |\
+ Package (= libsdformat9-dev) |\
+ Package (= sdformat9-doc) |\
+ Package (= sdformat9-sdf) \
+), $Version (% 9.7.0-1~*)) \
 "

From 082c98fc5cfbd59cbf2f40c031a982ca2e859428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 17:27:23 -0700
Subject: [PATCH 02/10] Update config using the latest script version.

---
 ...gnition_citadel_gazebo11_ubuntu_focal.yaml | 244 +++++++++---------
 1 file changed, 126 insertions(+), 118 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
index aea8c624..91eda03a 100644
--- a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
+++ b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
@@ -2,7 +2,7 @@ name: ignition_citadel_gazebo11_ubuntu_focal
 method: http://packages.osrfoundation.org/gazebo/ubuntu-stable
 suites: [focal]
 component: main
-architectures: [amd64, i386, armhf, arm64, source]
+architectures: [amd64, armhf, arm64, source]
 filter_formula: "\
 (Package (= gazebo11) |\
  Package (= gazebo11-common) |\
@@ -11,127 +11,135 @@ filter_formula: "\
  Package (= gazebo11-plugin-base) |\
  Package (= libgazebo11) |\
  Package (= libgazebo11-dev) \
-), $Version (% 11.9.0-1~*)) |\
+), $Version (% 11.10.2-1*) |\
+(Package (= ignition-citadel) \
+), $Version (% 1.0.2-1*) |\
 (Package (= ignition-cmake2) |\
  Package (= libignition-cmake2-dev) \
-), $Version (% 2.9.0-1~*)) |\
-(Package (= ignition-citadel), ), $Version (% 1.0.2*))|\
-(Package (= ignition-common3) |\
- Package (= libignition-common3) |\
- Package (= libignition-common3-av) |\
- Package (= libignition-common3-av-dev) |\
- Package (= libignition-common3-core-dev) |\
- Package (= libignition-common3-dev) |\
- Package (= libignition-common3-events) |\
- Package (= libignition-common3-events-dev) |\
- Package (= libignition-common3-graphics) |\
- Package (= libignition-common3-graphics-dev) |\
- Package (= libignition-common3-profiler) |\
- Package (= libignition-common3-profiler-dev) \
-), $Version (% 3.14.0-1~*)) |\
-(Package (= ignition-fuel-tools4) |\
- Package (= libignition-fuel-tools4) |\
- Package (= libignition-fuel-tools4-dev) \
-), $Version (% 4.4.0-1~*)) |\
-(Package (= ignition-gazebo3) |\
- Package (= libignition-gazebo3) |\
- Package (= libignition-gazebo3-dev) |\
- Package (= libignition-gazebo3-plugins) \
-), $Version (% 3.12.0-1~*)) |\
-(Package (= ignition-gui3) |\
- Package (= libignition-gui3) |\
- Package (= libignition-gui3-dev) \
-), $Version (% 3.8.0-1~*)) |\
-(Package (= ignition-launch2) |\
- Package (= libignition-launch2) |\
- Package (= libignition-launch2-dev) \
-), $Version (% 2.2.2-1~*)) |\
+), $Version (% 2.12.1-1*) |\
+(Package (= ignition-common4) |\
+ Package (= libignition-common4) |\
+ Package (= libignition-common4-av) |\
+ Package (= libignition-common4-av-dev) |\
+ Package (= libignition-common4-core-dev) |\
+ Package (= libignition-common4-dev) |\
+ Package (= libignition-common4-events) |\
+ Package (= libignition-common4-events-dev) |\
+ Package (= libignition-common4-graphics) |\
+ Package (= libignition-common4-graphics-dev) |\
+ Package (= libignition-common4-profiler) |\
+ Package (= libignition-common4-profiler-dev) \
+), $Version (% 4.5.0-1*) |\
+(Package (= ignition-fuel-tools6) |\
+ Package (= libignition-fuel-tools6) |\
+ Package (= libignition-fuel-tools6-dev) \
+), $Version (% 6.2.0-1*) |\
+(Package (= ignition-gazebo5) |\
+ Package (= libignition-gazebo5) |\
+ Package (= libignition-gazebo5-dbg) |\
+ Package (= libignition-gazebo5-dev) |\
+ Package (= libignition-gazebo5-plugins) \
+), $Version (% 5.4.0-1*) |\
+(Package (= ignition-gui5) |\
+ Package (= libignition-gui5) |\
+ Package (= libignition-gui5-dev) \
+), $Version (% 5.5.0-1*) |\
+(Package (= ignition-launch4) |\
+ Package (= libignition-launch4) |\
+ Package (= libignition-launch4-dev) \
+), $Version (% 4.1.0-1*) |\
 (Package (= ignition-math6) |\
  Package (= libignition-math6) |\
  Package (= libignition-math6-dbg) |\
  Package (= libignition-math6-dev) |\
- Package (= libignition-math6-eigen3-dev) \
-), $Version (% 6.9.2-1~*)) |\
-(Package (= ignition-msgs5) |\
- Package (= libignition-msgs5) |\
- Package (= libignition-msgs5-dev) |\
- Package (= libignition-msgs5-dbg) \
-), $Version (% 5.8.1-1~*)) |\
-(Package (= ignition-physics2) |\
- Package (= libignition-physics2) |\
- Package (= libignition-physics2-core-dev) |\
- Package (= libignition-physics2-dartsim) |\
- Package (= libignition-physics2-dartsim-dev) |\
- Package (= libignition-physics2-dev) |\
- Package (= libignition-physics2-mesh-dev) |\
- Package (= libignition-physics2-sdf-dev) |\
- Package (= libignition-physics2-tpe) |\
- Package (= libignition-physics2-tpe-dev) |\
- Package (= libignition-physics2-tpelib) |\
- Package (= libignition-physics2-tpelib-dev) \
-), $Version (% 2.5.0-1~*)) |\
-(Package (= ignition-plugin) |\
- Package (= libignition-plugin) |\
- Package (= libignition-plugin-dev) \
-), $Version (% 1.2.1-1~*)) |\
-(Package (= ignition-rendering3) |\
- Package (= libignition-rendering3) |\
- Package (= libignition-rendering3-core-dev) |\
- Package (= libignition-rendering3-dev) |\
- Package (= libignition-rendering3-ogre1) |\
- Package (= libignition-rendering3-ogre1-dev) |\
- Package (= libignition-rendering3-ogre2) |\
- Package (= libignition-rendering3-ogre2-dev) \
-), $Version (% 3.6.0-1~*)) |\
-(Package (= ignition-sensors3) |\
- Package (= libignition-sensors3) |\
- Package (= libignition-sensors3-air-pressure) |\
- Package (= libignition-sensors3-air-pressure-dev) |\
- Package (= libignition-sensors3-altimeter) |\
- Package (= libignition-sensors3-altimeter-dev) |\
- Package (= libignition-sensors3-camera) |\
- Package (= libignition-sensors3-camera-dev) |\
- Package (= libignition-sensors3-core-dev) |\
- Package (= libignition-sensors3-depth-camera) |\
- Package (= libignition-sensors3-depth-camera-dev) |\
- Package (= libignition-sensors3-dev) |\
- Package (= libignition-sensors3-gpu-lidar) |\
- Package (= libignition-sensors3-gpu-lidar-dev) |\
- Package (= libignition-sensors3-imu) |\
- Package (= libignition-sensors3-imu-dev) |\
- Package (= libignition-sensors3-lidar) |\
- Package (= libignition-sensors3-lidar-dev) |\
- Package (= libignition-sensors3-logical-camera) |\
- Package (= libignition-sensors3-logical-camera-dev) |\
- Package (= libignition-sensors3-magnetometer) |\
- Package (= libignition-sensors3-magnetometer-dev) |\
- Package (= libignition-sensors3-rendering) |\
- Package (= libignition-sensors3-rendering-dev) |\
- Package (= libignition-sensors3-rgbd-camera) |\
- Package (= libignition-sensors3-rgbd-camera-dev) |\
- Package (= libignition-sensors3-thermal-camera) |\
- Package (= libignition-sensors3-thermal-camera-dev) \
-), $Version (% 3.3.0-1~*)) |\
-(Package (= ignition-tools) |\
- Package (= libignition-tools-dev) \
-), $Version (% 1.4.1-1~*)) |\
-(Package (= ignition-transport8) |\
- Package (= libignition-transport8) |\
- Package (= libignition-transport8-core-dev) |\
- Package (= libignition-transport8-dbg) |\
- Package (= libignition-transport8-dev) |\
- Package (= libignition-transport8-log) |\
- Package (= libignition-transport8-log-dev) \
-), $Version (% 8.2.1-1~*)) |\
-(Package (= ogre-2.1) |\
- Package (= libogre-2.1) |\
- Package (= libogre-2.1-dev)),
-), $Version (% 2.0.9999~20180616~06a386f-3osrf~*)) |\
-(Package (= sdformat9) |\
- Package (= libsdformat9) |\
- Package (= libsdformat9-dbg) |\
- Package (= libsdformat9-dev) |\
- Package (= sdformat9-doc) |\
- Package (= sdformat9-sdf) \
-), $Version (% 9.7.0-1~*)) \
+ Package (= libignition-math6-eigen3-dev) |\
+ Package (= python3-ignition-math6) |\
+ Package (= ruby-ignition-math6) \
+), $Version (% 6.10.0-1*) |\
+(Package (= ignition-msgs7) |\
+ Package (= libignition-msgs7) |\
+ Package (= libignition-msgs7-dev) \
+), $Version (% 7.3.0-1*) |\
+(Package (= ignition-physics4) |\
+ Package (= libignition-physics4) |\
+ Package (= libignition-physics4-bullet) |\
+ Package (= libignition-physics4-bullet-dev) |\
+ Package (= libignition-physics4-core-dev) |\
+ Package (= libignition-physics4-dartsim) |\
+ Package (= libignition-physics4-dartsim-dev) |\
+ Package (= libignition-physics4-dev) |\
+ Package (= libignition-physics4-heightmap-dev) |\
+ Package (= libignition-physics4-mesh-dev) |\
+ Package (= libignition-physics4-sdf-dev) |\
+ Package (= libignition-physics4-tpe) |\
+ Package (= libignition-physics4-tpe-dev) |\
+ Package (= libignition-physics4-tpelib) |\
+ Package (= libignition-physics4-tpelib-dev) \
+), $Version (% 4.3.0-1*) |\
+(Package (= ignition-rendering5) |\
+ Package (= libignition-rendering5) |\
+ Package (= libignition-rendering5-core-dev) |\
+ Package (= libignition-rendering5-dev) |\
+ Package (= libignition-rendering5-ogre1) |\
+ Package (= libignition-rendering5-ogre1-dev) |\
+ Package (= libignition-rendering5-ogre2) |\
+ Package (= libignition-rendering5-ogre2-dev) \
+), $Version (% 5.2.1-1*) |\
+(Package (= ignition-sensors5) |\
+ Package (= libignition-sensors5) |\
+ Package (= libignition-sensors5-air-pressure) |\
+ Package (= libignition-sensors5-air-pressure-dev) |\
+ Package (= libignition-sensors5-altimeter) |\
+ Package (= libignition-sensors5-altimeter-dev) |\
+ Package (= libignition-sensors5-camera) |\
+ Package (= libignition-sensors5-camera-dev) |\
+ Package (= libignition-sensors5-core-dev) |\
+ Package (= libignition-sensors5-depth-camera) |\
+ Package (= libignition-sensors5-depth-camera-dev) |\
+ Package (= libignition-sensors5-dev) |\
+ Package (= libignition-sensors5-gpu-lidar) |\
+ Package (= libignition-sensors5-gpu-lidar-dev) |\
+ Package (= libignition-sensors5-imu) |\
+ Package (= libignition-sensors5-imu-dev) |\
+ Package (= libignition-sensors5-lidar) |\
+ Package (= libignition-sensors5-lidar-dev) |\
+ Package (= libignition-sensors5-logical-camera) |\
+ Package (= libignition-sensors5-logical-camera-dev) |\
+ Package (= libignition-sensors5-magnetometer) |\
+ Package (= libignition-sensors5-magnetometer-dev) |\
+ Package (= libignition-sensors5-rendering) |\
+ Package (= libignition-sensors5-rendering-dev) |\
+ Package (= libignition-sensors5-rgbd-camera) |\
+ Package (= libignition-sensors5-rgbd-camera-dev) |\
+ Package (= libignition-sensors5-thermal-camera) |\
+ Package (= libignition-sensors5-thermal-camera-dev) \
+), $Version (% 5.1.1-1*) |\
+(Package (= ignition-transport10) |\
+ Package (= libignition-transport10) |\
+ Package (= libignition-transport10-core-dev) |\
+ Package (= libignition-transport10-dbg) |\
+ Package (= libignition-transport10-dev) |\
+ Package (= libignition-transport10-log) |\
+ Package (= libignition-transport10-log-dev) \
+), $Version (% 10.2.0-1*) |\
+(Package (= ignition-utils1) |\
+ Package (= libignition-utils1) |\
+ Package (= libignition-utils1-cli-dev) |\
+ Package (= libignition-utils1-dbg) |\
+ Package (= libignition-utils1-dev) \
+), $Version (% 1.4.0-1*) |\
+(Package (= ogre-2.2) |\
+ Package (= blender-ogrexml-2.2) |\
+ Package (= libogre-2.2) |\
+ Package (= libogre-2.2-dev) |\
+ Package (= ogre-2.2-doc) |\
+ Package (= ogre-2.2-tools) \
+), $Version (% 2.2.5+20210824~ec3f70c-4*) |\
+(Package (= sdformat11) |\
+ Package (= libsdformat11) |\
+ Package (= libsdformat11-dbg) |\
+ Package (= libsdformat11-dev) |\
+ Package (= sdformat11-doc) |\
+ Package (= sdformat11-sdf) \
+), $Version (% 11.4.1-1*) \
 "

From d323009ce593df00a2821ed0f986264a85a9355c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 18:13:11 -0700
Subject: [PATCH 03/10] Merge changes from #151.

---
 .github/workflows/ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb2f22c6..cb5b4de2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Install aptly repo
         run: |
             wget -qO - https://www.aptly.info/pubkey.txt | sudo apt-key add -
@@ -74,13 +76,16 @@ jobs:
           _DEBUG_MSGS_REPREPRO_UPDATER_TEST_SUITE_: ${{ matrix.show_debug_cmds }}
           _ALLOW_DESTRUCTIVE_TESTS_REPREPRO_UPDATER_TEST_SUITE_: true
       # CONFIG FILE TESTER
-      - id: files
+      - name: Idenfify files changed in this PR.
+        id: files
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
-        uses: jitterbit/get-changed-files@v1
+        run: |
+          git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }}
+          echo "::set-output name=changed-files::$(git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }})"
       - name: Run testing on changed config files
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
         run: |
-          for changed_file in ${{ steps.files.outputs.all }}; do
+          for changed_file in ${{ steps.files.outputs.changed-files }}; do
             if [[ ${changed_file} != ${changed_file/config\/*.yaml} ]]; then
               echo "+ Detected config file: ${changed_file}."
               python3 scripts/aptly/aptly_importer.py --ignore-signatures --only-mirror-creation ${changed_file}

From f9c6d733283e31048dca154b45c542e4231f7a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 18:18:43 -0700
Subject: [PATCH 04/10] Try tr.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb5b4de2..609533fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
         run: |
           git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }}
-          echo "::set-output name=changed-files::$(git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }})"
+          echo "::set-output name=changed-files::$(git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }}| tr '\n' ' ')"
       - name: Run testing on changed config files
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
         run: |

From 83306571355bd3720e3a6a69962997e09f240a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 18:20:25 -0700
Subject: [PATCH 05/10] Try merge base.

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 609533fb..9b3c0699 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,8 +80,8 @@ jobs:
         id: files
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
         run: |
-          git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }}
-          echo "::set-output name=changed-files::$(git diff --name-only origin/${{ github.base_ref }}..origin/${{ github.head_ref }}| tr '\n' ' ')"
+          git diff --name-only origin/${{ github.base_ref }}...origin/${{ github.head_ref }}
+          echo "::set-output name=changed-files::$(git diff --name-only origin/${{ github.base_ref }}...origin/${{ github.head_ref }}| tr '\n' ' ')"
       - name: Run testing on changed config files
         if: ${{ matrix.job_type == 'CONFIG_TESTER' }}
         run: |

From 9de3f89c913126822d86ec4b65117448b8218450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 19:09:22 -0700
Subject: [PATCH 06/10] Manual cleanup.

---
 config/ignition_citadel_gazebo11_debian_buster.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_debian_buster.yaml b/config/ignition_citadel_gazebo11_debian_buster.yaml
index a35f08d4..484c1f8f 100644
--- a/config/ignition_citadel_gazebo11_debian_buster.yaml
+++ b/config/ignition_citadel_gazebo11_debian_buster.yaml
@@ -15,7 +15,8 @@ filter_formula: "\
 (Package (= ignition-cmake2) |\
  Package (= libignition-cmake2-dev) \
 ), $Version (% 2.9.0-1~*) |\
-(Package (= ignition-citadel), $Version (% 1.0.2*))|\
+(Package (= ignition-citadel)
+), $Version (% 1.0.2*) |\
 (Package (= ignition-common3) |\
  Package (= libignition-common3) |\
  Package (= libignition-common3-av) |\
@@ -125,7 +126,7 @@ filter_formula: "\
 ), $Version (% 8.2.1-1~*) |\
 (Package (= ogre-2.1) |\
  Package (= libogre-2.1) |\
- Package (= libogre-2.1-dev)),
+ Package (= libogre-2.1-dev)
 ), $Version (% 2.0.9999~20180616~06a386f-3osrf~*) |\
 (Package (= sdformat9) |\
  Package (= libsdformat9) |\
@@ -133,5 +134,5 @@ filter_formula: "\
  Package (= libsdformat9-dev) |\
  Package (= sdformat9-doc) |\
  Package (= sdformat9-sdf) \
-), $Version (% 9.7.0-1~*)) \
+), $Version (% 9.7.0-1~*) \
 "

From 0e6650d2529e8e46150885255ec1dbdcbe0c0af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 19:18:15 -0700
Subject: [PATCH 07/10] Updates using generator script.

---
 ...nition_citadel_gazebo11_debian_buster.yaml | 277 ++++++++++--------
 1 file changed, 158 insertions(+), 119 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_debian_buster.yaml b/config/ignition_citadel_gazebo11_debian_buster.yaml
index 484c1f8f..6d7d96a4 100644
--- a/config/ignition_citadel_gazebo11_debian_buster.yaml
+++ b/config/ignition_citadel_gazebo11_debian_buster.yaml
@@ -2,7 +2,7 @@ name: ignition_citadel_gazebo11_debian_buster
 method: http://packages.osrfoundation.org/gazebo/debian-stable
 suites: [buster]
 component: main
-architectures: [amd64, i386, armhf, arm64, source]
+architectures: [amd64, armhf, arm64, source]
 filter_formula: "\
 (Package (= gazebo11) |\
  Package (= gazebo11-common) |\
@@ -11,128 +11,167 @@ filter_formula: "\
  Package (= gazebo11-plugin-base) |\
  Package (= libgazebo11) |\
  Package (= libgazebo11-dev) \
-), $Version (% 11.9.0-1~*) |\
+), $Version (% 11.10.2-1*) |\
+(Package (= ignition-citadel) \
+), $Version (% 1.0.2-1*) |\
 (Package (= ignition-cmake2) |\
  Package (= libignition-cmake2-dev) \
-), $Version (% 2.9.0-1~*) |\
-(Package (= ignition-citadel)
-), $Version (% 1.0.2*) |\
-(Package (= ignition-common3) |\
- Package (= libignition-common3) |\
- Package (= libignition-common3-av) |\
- Package (= libignition-common3-av-dev) |\
- Package (= libignition-common3-core-dev) |\
- Package (= libignition-common3-dev) |\
- Package (= libignition-common3-events) |\
- Package (= libignition-common3-events-dev) |\
- Package (= libignition-common3-graphics) |\
- Package (= libignition-common3-graphics-dev) |\
- Package (= libignition-common3-profiler) |\
- Package (= libignition-common3-profiler-dev) \
-), $Version (% 3.14.0-1~*) |\
-(Package (= ignition-fuel-tools4) |\
- Package (= libignition-fuel-tools4) |\
- Package (= libignition-fuel-tools4-dev) \
-), $Version (% 4.4.0-1~*) |\
-(Package (= ignition-gazebo3) |\
- Package (= libignition-gazebo3) |\
- Package (= libignition-gazebo3-dev) |\
- Package (= libignition-gazebo3-plugins) \
-), $Version (% 3.12.0-1~*) |\
-(Package (= ignition-gui3) |\
- Package (= libignition-gui3) |\
- Package (= libignition-gui3-dev) \
-), $Version (% 3.8.0-1~*) |\
-(Package (= ignition-launch2) |\
- Package (= libignition-launch2) |\
- Package (= libignition-launch2-dev) \
-), $Version (% 2.2.2-1~*) |\
+), $Version (% 2.12.1-1*) |\
+(Package (= ignition-common4) |\
+ Package (= libignition-common4) |\
+ Package (= libignition-common4-av) |\
+ Package (= libignition-common4-av-dbgsym) |\
+ Package (= libignition-common4-av-dev) |\
+ Package (= libignition-common4-core-dev) |\
+ Package (= libignition-common4-dbgsym) |\
+ Package (= libignition-common4-dev) |\
+ Package (= libignition-common4-events) |\
+ Package (= libignition-common4-events-dbgsym) |\
+ Package (= libignition-common4-events-dev) |\
+ Package (= libignition-common4-graphics) |\
+ Package (= libignition-common4-graphics-dbgsym) |\
+ Package (= libignition-common4-graphics-dev) |\
+ Package (= libignition-common4-profiler) |\
+ Package (= libignition-common4-profiler-dbgsym) |\
+ Package (= libignition-common4-profiler-dev) \
+), $Version (% 4.5.0-1*) |\
+(Package (= ignition-fuel-tools6) |\
+ Package (= libignition-fuel-tools6) |\
+ Package (= libignition-fuel-tools6-dbgsym) |\
+ Package (= libignition-fuel-tools6-dev) \
+), $Version (% 6.2.0-1*) |\
+(Package (= ignition-gazebo5) |\
+ Package (= libignition-gazebo5) |\
+ Package (= libignition-gazebo5-dbg) |\
+ Package (= libignition-gazebo5-dev) |\
+ Package (= libignition-gazebo5-plugins) \
+), $Version (% 5.2.0-1*) |\
+(Package (= ignition-gui5) |\
+ Package (= libignition-gui5) |\
+ Package (= libignition-gui5-dbgsym) |\
+ Package (= libignition-gui5-dev) \
+), $Version (% 5.5.0-1*) |\
+(Package (= ignition-launch4) |\
+ Package (= libignition-launch4) |\
+ Package (= libignition-launch4-dbgsym) |\
+ Package (= libignition-launch4-dev) \
+), $Version (% 4.1.0-1*) |\
 (Package (= ignition-math6) |\
  Package (= libignition-math6) |\
  Package (= libignition-math6-dbg) |\
  Package (= libignition-math6-dev) |\
- Package (= libignition-math6-eigen3-dev) \
-), $Version (% 6.9.2-1~*) |\
-(Package (= ignition-msgs5) |\
- Package (= libignition-msgs5) |\
- Package (= libignition-msgs5-dev) |\
- Package (= libignition-msgs5-dbg) \
-), $Version (% 5.8.1-1~*) |\
-(Package (= ignition-physics2) |\
- Package (= libignition-physics2) |\
- Package (= libignition-physics2-core-dev) |\
- Package (= libignition-physics2-dartsim) |\
- Package (= libignition-physics2-dartsim-dev) |\
- Package (= libignition-physics2-dev) |\
- Package (= libignition-physics2-mesh-dev) |\
- Package (= libignition-physics2-sdf-dev) |\
- Package (= libignition-physics2-tpe) |\
- Package (= libignition-physics2-tpe-dev) |\
- Package (= libignition-physics2-tpelib) |\
- Package (= libignition-physics2-tpelib-dev) \
-), $Version (% 2.5.0-1~*) |\
-(Package (= ignition-plugin) |\
- Package (= libignition-plugin) |\
- Package (= libignition-plugin-dev) \
-), $Version (% 1.2.1-1~*) |\
-(Package (= ignition-rendering3) |\
- Package (= libignition-rendering3) |\
- Package (= libignition-rendering3-core-dev) |\
- Package (= libignition-rendering3-dev) |\
- Package (= libignition-rendering3-ogre1) |\
- Package (= libignition-rendering3-ogre1-dev) |\
- Package (= libignition-rendering3-ogre2) |\
- Package (= libignition-rendering3-ogre2-dev) \
-), $Version (% 3.6.0-1~*) |\
-(Package (= ignition-sensors3) |\
- Package (= libignition-sensors3) |\
- Package (= libignition-sensors3-air-pressure) |\
- Package (= libignition-sensors3-air-pressure-dev) |\
- Package (= libignition-sensors3-altimeter) |\
- Package (= libignition-sensors3-altimeter-dev) |\
- Package (= libignition-sensors3-camera) |\
- Package (= libignition-sensors3-camera-dev) |\
- Package (= libignition-sensors3-core-dev) |\
- Package (= libignition-sensors3-depth-camera) |\
- Package (= libignition-sensors3-depth-camera-dev) |\
- Package (= libignition-sensors3-dev) |\
- Package (= libignition-sensors3-gpu-lidar) |\
- Package (= libignition-sensors3-gpu-lidar-dev) |\
- Package (= libignition-sensors3-imu) |\
- Package (= libignition-sensors3-imu-dev) |\
- Package (= libignition-sensors3-lidar) |\
- Package (= libignition-sensors3-lidar-dev) |\
- Package (= libignition-sensors3-logical-camera) |\
- Package (= libignition-sensors3-logical-camera-dev) |\
- Package (= libignition-sensors3-magnetometer) |\
- Package (= libignition-sensors3-magnetometer-dev) |\
- Package (= libignition-sensors3-rendering) |\
- Package (= libignition-sensors3-rendering-dev) |\
- Package (= libignition-sensors3-rgbd-camera) |\
- Package (= libignition-sensors3-rgbd-camera-dev) |\
- Package (= libignition-sensors3-thermal-camera) |\
- Package (= libignition-sensors3-thermal-camera-dev) \
-), $Version (% 3.3.0-1~*) |\
-(Package (= ignition-tools) |\
- Package (= libignition-tools-dev) \
-), $Version (% 1.4.1-1~*) |\
-(Package (= ignition-transport8) |\
- Package (= libignition-transport8) |\
- Package (= libignition-transport8-core-dev) |\
- Package (= libignition-transport8-dbg) |\
- Package (= libignition-transport8-dev) |\
- Package (= libignition-transport8-log) |\
- Package (= libignition-transport8-log-dev) \
-), $Version (% 8.2.1-1~*) |\
-(Package (= ogre-2.1) |\
- Package (= libogre-2.1) |\
- Package (= libogre-2.1-dev)
-), $Version (% 2.0.9999~20180616~06a386f-3osrf~*) |\
-(Package (= sdformat9) |\
- Package (= libsdformat9) |\
- Package (= libsdformat9-dbg) |\
- Package (= libsdformat9-dev) |\
- Package (= sdformat9-doc) |\
- Package (= sdformat9-sdf) \
-), $Version (% 9.7.0-1~*) \
+ Package (= libignition-math6-eigen3-dev) |\
+ Package (= python3-ignition-math6) |\
+ Package (= ruby-ignition-math6) \
+), $Version (% 6.9.2-1*) |\
+(Package (= ignition-msgs7) |\
+ Package (= libignition-msgs7) |\
+ Package (= libignition-msgs7-dbgsym) |\
+ Package (= libignition-msgs7-dev) \
+), $Version (% 7.3.0-1*) |\
+(Package (= ignition-physics4) |\
+ Package (= libignition-physics4) |\
+ Package (= libignition-physics4-bullet) |\
+ Package (= libignition-physics4-bullet-dbgsym) |\
+ Package (= libignition-physics4-bullet-dev) |\
+ Package (= libignition-physics4-core-dev) |\
+ Package (= libignition-physics4-dartsim) |\
+ Package (= libignition-physics4-dartsim-dbgsym) |\
+ Package (= libignition-physics4-dartsim-dev) |\
+ Package (= libignition-physics4-dbgsym) |\
+ Package (= libignition-physics4-dev) |\
+ Package (= libignition-physics4-heightmap-dev) |\
+ Package (= libignition-physics4-mesh-dev) |\
+ Package (= libignition-physics4-sdf-dev) |\
+ Package (= libignition-physics4-tpe) |\
+ Package (= libignition-physics4-tpe-dbgsym) |\
+ Package (= libignition-physics4-tpe-dev) |\
+ Package (= libignition-physics4-tpelib) |\
+ Package (= libignition-physics4-tpelib-dbgsym) |\
+ Package (= libignition-physics4-tpelib-dev) \
+), $Version (% 4.2.0-2*) |\
+(Package (= ignition-rendering5) |\
+ Package (= libignition-rendering5) |\
+ Package (= libignition-rendering5-core-dev) |\
+ Package (= libignition-rendering5-dbgsym) |\
+ Package (= libignition-rendering5-dev) |\
+ Package (= libignition-rendering5-ogre1) |\
+ Package (= libignition-rendering5-ogre1-dbgsym) |\
+ Package (= libignition-rendering5-ogre1-dev) |\
+ Package (= libignition-rendering5-ogre2) |\
+ Package (= libignition-rendering5-ogre2-dbgsym) |\
+ Package (= libignition-rendering5-ogre2-dev) \
+), $Version (% 5.2.1-1*) |\
+(Package (= ignition-sensors5) |\
+ Package (= libignition-sensors5) |\
+ Package (= libignition-sensors5-air-pressure) |\
+ Package (= libignition-sensors5-air-pressure-dbgsym) |\
+ Package (= libignition-sensors5-air-pressure-dev) |\
+ Package (= libignition-sensors5-altimeter) |\
+ Package (= libignition-sensors5-altimeter-dbgsym) |\
+ Package (= libignition-sensors5-altimeter-dev) |\
+ Package (= libignition-sensors5-camera) |\
+ Package (= libignition-sensors5-camera-dbgsym) |\
+ Package (= libignition-sensors5-camera-dev) |\
+ Package (= libignition-sensors5-core-dev) |\
+ Package (= libignition-sensors5-dbgsym) |\
+ Package (= libignition-sensors5-depth-camera) |\
+ Package (= libignition-sensors5-depth-camera-dbgsym) |\
+ Package (= libignition-sensors5-depth-camera-dev) |\
+ Package (= libignition-sensors5-dev) |\
+ Package (= libignition-sensors5-gpu-lidar) |\
+ Package (= libignition-sensors5-gpu-lidar-dbgsym) |\
+ Package (= libignition-sensors5-gpu-lidar-dev) |\
+ Package (= libignition-sensors5-imu) |\
+ Package (= libignition-sensors5-imu-dbgsym) |\
+ Package (= libignition-sensors5-imu-dev) |\
+ Package (= libignition-sensors5-lidar) |\
+ Package (= libignition-sensors5-lidar-dbgsym) |\
+ Package (= libignition-sensors5-lidar-dev) |\
+ Package (= libignition-sensors5-logical-camera) |\
+ Package (= libignition-sensors5-logical-camera-dbgsym) |\
+ Package (= libignition-sensors5-logical-camera-dev) |\
+ Package (= libignition-sensors5-magnetometer) |\
+ Package (= libignition-sensors5-magnetometer-dbgsym) |\
+ Package (= libignition-sensors5-magnetometer-dev) |\
+ Package (= libignition-sensors5-rendering) |\
+ Package (= libignition-sensors5-rendering-dbgsym) |\
+ Package (= libignition-sensors5-rendering-dev) |\
+ Package (= libignition-sensors5-rgbd-camera) |\
+ Package (= libignition-sensors5-rgbd-camera-dbgsym) |\
+ Package (= libignition-sensors5-rgbd-camera-dev) |\
+ Package (= libignition-sensors5-thermal-camera) |\
+ Package (= libignition-sensors5-thermal-camera-dbgsym) |\
+ Package (= libignition-sensors5-thermal-camera-dev) \
+), $Version (% 5.1.1-1*) |\
+(Package (= ignition-transport10) |\
+ Package (= libignition-transport10) |\
+ Package (= libignition-transport10-core-dev) |\
+ Package (= libignition-transport10-dbg) |\
+ Package (= libignition-transport10-dev) |\
+ Package (= libignition-transport10-log) |\
+ Package (= libignition-transport10-log-dev) \
+), $Version (% 10.2.0-1*) |\
+(Package (= ignition-utils1) |\
+ Package (= libignition-utils1) |\
+ Package (= libignition-utils1-cli-dev) |\
+ Package (= libignition-utils1-dbg) |\
+ Package (= libignition-utils1-dev) \
+), $Version (% 1.4.0-1*) |\
+(Package (= ogre-2.2) |\
+ Package (= blender-ogrexml-2.2) |\
+ Package (= libogre-2.2) |\
+ Package (= libogre-2.2-dbgsym) |\
+ Package (= libogre-2.2-dev) |\
+ Package (= ogre-2.2-doc) |\
+ Package (= ogre-2.2-tools) |\
+ Package (= ogre-2.2-tools-dbgsym) \
+), $Version (% 2.2.5+20210824~ec3f70c-4*) |\
+(Package (= sdformat11) |\
+ Package (= libsdformat11) |\
+ Package (= libsdformat11-dbg) |\
+ Package (= libsdformat11-dev) |\
+ Package (= sdformat11-doc) |\
+ Package (= sdformat11-sdf) \
+), $Version (% 11.4.1-1*) \
 "

From 6288f3cd5986ca936f5659b44b1c4ecfdc1134f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Thu, 14 Apr 2022 19:21:30 -0700
Subject: [PATCH 08/10] Revert buster changes.

---
 ...nition_citadel_gazebo11_debian_buster.yaml | 302 ++++++++----------
 1 file changed, 131 insertions(+), 171 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_debian_buster.yaml b/config/ignition_citadel_gazebo11_debian_buster.yaml
index 6d7d96a4..aaf6f6b8 100644
--- a/config/ignition_citadel_gazebo11_debian_buster.yaml
+++ b/config/ignition_citadel_gazebo11_debian_buster.yaml
@@ -2,176 +2,136 @@ name: ignition_citadel_gazebo11_debian_buster
 method: http://packages.osrfoundation.org/gazebo/debian-stable
 suites: [buster]
 component: main
-architectures: [amd64, armhf, arm64, source]
+architectures: [amd64, i386, armhf, arm64, source]
 filter_formula: "\
-(Package (= gazebo11) |\
- Package (= gazebo11-common) |\
- Package (= gazebo11-dbg) |\
- Package (= gazebo11-doc) |\
- Package (= gazebo11-plugin-base) |\
- Package (= libgazebo11) |\
- Package (= libgazebo11-dev) \
-), $Version (% 11.10.2-1*) |\
-(Package (= ignition-citadel) \
-), $Version (% 1.0.2-1*) |\
-(Package (= ignition-cmake2) |\
- Package (= libignition-cmake2-dev) \
-), $Version (% 2.12.1-1*) |\
-(Package (= ignition-common4) |\
- Package (= libignition-common4) |\
- Package (= libignition-common4-av) |\
- Package (= libignition-common4-av-dbgsym) |\
- Package (= libignition-common4-av-dev) |\
- Package (= libignition-common4-core-dev) |\
- Package (= libignition-common4-dbgsym) |\
- Package (= libignition-common4-dev) |\
- Package (= libignition-common4-events) |\
- Package (= libignition-common4-events-dbgsym) |\
- Package (= libignition-common4-events-dev) |\
- Package (= libignition-common4-graphics) |\
- Package (= libignition-common4-graphics-dbgsym) |\
- Package (= libignition-common4-graphics-dev) |\
- Package (= libignition-common4-profiler) |\
- Package (= libignition-common4-profiler-dbgsym) |\
- Package (= libignition-common4-profiler-dev) \
-), $Version (% 4.5.0-1*) |\
-(Package (= ignition-fuel-tools6) |\
- Package (= libignition-fuel-tools6) |\
- Package (= libignition-fuel-tools6-dbgsym) |\
- Package (= libignition-fuel-tools6-dev) \
-), $Version (% 6.2.0-1*) |\
-(Package (= ignition-gazebo5) |\
- Package (= libignition-gazebo5) |\
- Package (= libignition-gazebo5-dbg) |\
- Package (= libignition-gazebo5-dev) |\
- Package (= libignition-gazebo5-plugins) \
-), $Version (% 5.2.0-1*) |\
-(Package (= ignition-gui5) |\
- Package (= libignition-gui5) |\
- Package (= libignition-gui5-dbgsym) |\
- Package (= libignition-gui5-dev) \
-), $Version (% 5.5.0-1*) |\
-(Package (= ignition-launch4) |\
- Package (= libignition-launch4) |\
- Package (= libignition-launch4-dbgsym) |\
- Package (= libignition-launch4-dev) \
-), $Version (% 4.1.0-1*) |\
-(Package (= ignition-math6) |\
- Package (= libignition-math6) |\
- Package (= libignition-math6-dbg) |\
- Package (= libignition-math6-dev) |\
- Package (= libignition-math6-eigen3-dev) |\
- Package (= python3-ignition-math6) |\
- Package (= ruby-ignition-math6) \
-), $Version (% 6.9.2-1*) |\
-(Package (= ignition-msgs7) |\
- Package (= libignition-msgs7) |\
- Package (= libignition-msgs7-dbgsym) |\
- Package (= libignition-msgs7-dev) \
-), $Version (% 7.3.0-1*) |\
-(Package (= ignition-physics4) |\
- Package (= libignition-physics4) |\
- Package (= libignition-physics4-bullet) |\
- Package (= libignition-physics4-bullet-dbgsym) |\
- Package (= libignition-physics4-bullet-dev) |\
- Package (= libignition-physics4-core-dev) |\
- Package (= libignition-physics4-dartsim) |\
- Package (= libignition-physics4-dartsim-dbgsym) |\
- Package (= libignition-physics4-dartsim-dev) |\
- Package (= libignition-physics4-dbgsym) |\
- Package (= libignition-physics4-dev) |\
- Package (= libignition-physics4-heightmap-dev) |\
- Package (= libignition-physics4-mesh-dev) |\
- Package (= libignition-physics4-sdf-dev) |\
- Package (= libignition-physics4-tpe) |\
- Package (= libignition-physics4-tpe-dbgsym) |\
- Package (= libignition-physics4-tpe-dev) |\
- Package (= libignition-physics4-tpelib) |\
- Package (= libignition-physics4-tpelib-dbgsym) |\
- Package (= libignition-physics4-tpelib-dev) \
-), $Version (% 4.2.0-2*) |\
-(Package (= ignition-rendering5) |\
- Package (= libignition-rendering5) |\
- Package (= libignition-rendering5-core-dev) |\
- Package (= libignition-rendering5-dbgsym) |\
- Package (= libignition-rendering5-dev) |\
- Package (= libignition-rendering5-ogre1) |\
- Package (= libignition-rendering5-ogre1-dbgsym) |\
- Package (= libignition-rendering5-ogre1-dev) |\
- Package (= libignition-rendering5-ogre2) |\
- Package (= libignition-rendering5-ogre2-dbgsym) |\
- Package (= libignition-rendering5-ogre2-dev) \
-), $Version (% 5.2.1-1*) |\
-(Package (= ignition-sensors5) |\
- Package (= libignition-sensors5) |\
- Package (= libignition-sensors5-air-pressure) |\
- Package (= libignition-sensors5-air-pressure-dbgsym) |\
- Package (= libignition-sensors5-air-pressure-dev) |\
- Package (= libignition-sensors5-altimeter) |\
- Package (= libignition-sensors5-altimeter-dbgsym) |\
- Package (= libignition-sensors5-altimeter-dev) |\
- Package (= libignition-sensors5-camera) |\
- Package (= libignition-sensors5-camera-dbgsym) |\
- Package (= libignition-sensors5-camera-dev) |\
- Package (= libignition-sensors5-core-dev) |\
- Package (= libignition-sensors5-dbgsym) |\
- Package (= libignition-sensors5-depth-camera) |\
- Package (= libignition-sensors5-depth-camera-dbgsym) |\
- Package (= libignition-sensors5-depth-camera-dev) |\
- Package (= libignition-sensors5-dev) |\
- Package (= libignition-sensors5-gpu-lidar) |\
- Package (= libignition-sensors5-gpu-lidar-dbgsym) |\
- Package (= libignition-sensors5-gpu-lidar-dev) |\
- Package (= libignition-sensors5-imu) |\
- Package (= libignition-sensors5-imu-dbgsym) |\
- Package (= libignition-sensors5-imu-dev) |\
- Package (= libignition-sensors5-lidar) |\
- Package (= libignition-sensors5-lidar-dbgsym) |\
- Package (= libignition-sensors5-lidar-dev) |\
- Package (= libignition-sensors5-logical-camera) |\
- Package (= libignition-sensors5-logical-camera-dbgsym) |\
- Package (= libignition-sensors5-logical-camera-dev) |\
- Package (= libignition-sensors5-magnetometer) |\
- Package (= libignition-sensors5-magnetometer-dbgsym) |\
- Package (= libignition-sensors5-magnetometer-dev) |\
- Package (= libignition-sensors5-rendering) |\
- Package (= libignition-sensors5-rendering-dbgsym) |\
- Package (= libignition-sensors5-rendering-dev) |\
- Package (= libignition-sensors5-rgbd-camera) |\
- Package (= libignition-sensors5-rgbd-camera-dbgsym) |\
- Package (= libignition-sensors5-rgbd-camera-dev) |\
- Package (= libignition-sensors5-thermal-camera) |\
- Package (= libignition-sensors5-thermal-camera-dbgsym) |\
- Package (= libignition-sensors5-thermal-camera-dev) \
-), $Version (% 5.1.1-1*) |\
-(Package (= ignition-transport10) |\
- Package (= libignition-transport10) |\
- Package (= libignition-transport10-core-dev) |\
- Package (= libignition-transport10-dbg) |\
- Package (= libignition-transport10-dev) |\
- Package (= libignition-transport10-log) |\
- Package (= libignition-transport10-log-dev) \
-), $Version (% 10.2.0-1*) |\
-(Package (= ignition-utils1) |\
- Package (= libignition-utils1) |\
- Package (= libignition-utils1-cli-dev) |\
- Package (= libignition-utils1-dbg) |\
- Package (= libignition-utils1-dev) \
-), $Version (% 1.4.0-1*) |\
-(Package (= ogre-2.2) |\
- Package (= blender-ogrexml-2.2) |\
- Package (= libogre-2.2) |\
- Package (= libogre-2.2-dbgsym) |\
- Package (= libogre-2.2-dev) |\
- Package (= ogre-2.2-doc) |\
- Package (= ogre-2.2-tools) |\
- Package (= ogre-2.2-tools-dbgsym) \
-), $Version (% 2.2.5+20210824~ec3f70c-4*) |\
-(Package (= sdformat11) |\
- Package (= libsdformat11) |\
- Package (= libsdformat11-dbg) |\
- Package (= libsdformat11-dev) |\
- Package (= sdformat11-doc) |\
- Package (= sdformat11-sdf) \
-), $Version (% 11.4.1-1*) \
+((Package (% =gazebo11) |\
+Package (% =gazebo11-common) |\
+Package (% =gazebo11-dbg) |\
+Package (% =gazebo11-doc) |\
+Package (% =gazebo11-plugin-base) |\
+Package (% =libgazebo11) |\
+Package (% =libgazebo11-dev)), \
+$Version (% 11.9.0-1~*)) |\
+((Package (% =ignition-cmake2) |\
+Package (% =libignition-cmake2-dev)), \
+$Version (% 2.9.0-1~*)) |\
+(Package (% =ignition-citadel), $Version (% 1.0.2*))|\
+((Package (% =ignition-common3) |\
+Package (% =libignition-common3) |\
+Package (% =libignition-common3-av) |\
+Package (% =libignition-common3-av-dev) |\
+Package (% =libignition-common3-core-dev) |\
+Package (% =libignition-common3-dev) |\
+Package (% =libignition-common3-events) |\
+Package (% =libignition-common3-events-dev) |\
+Package (% =libignition-common3-graphics) |\
+Package (% =libignition-common3-graphics-dev) |\
+Package (% =libignition-common3-profiler) |\
+Package (% =libignition-common3-profiler-dev)), \
+$Version (% 3.14.0-1~*)) |\
+((Package (% =ignition-fuel-tools4) |\
+Package (% =libignition-fuel-tools4) |\
+Package (% =libignition-fuel-tools4-dev)), \
+$Version (% 4.4.0-1~*)) |\
+((Package (% =ignition-gazebo3) |\
+Package (% =libignition-gazebo3) |\
+Package (% =libignition-gazebo3-dev) |\
+Package (% =libignition-gazebo3-plugins)), \
+$Version (% 3.12.0-1~*)) |\
+((Package (% =ignition-gui3) |\
+Package (% =libignition-gui3) |\
+Package (% =libignition-gui3-dev)), \
+$Version (% 3.8.0-1~*)) |\
+((Package (% =ignition-launch2) |\
+Package (% =libignition-launch2) |\
+Package (% =libignition-launch2-dev)), \
+$Version (% 2.2.2-1~*)) |\
+((Package (% =ignition-math6) |\
+Package (% =libignition-math6) |\
+Package (% =libignition-math6-dbg) |\
+Package (% =libignition-math6-dev) |\
+Package (% =libignition-math6-eigen3-dev)), \
+$Version (% 6.9.2-1~*)) |\
+((Package (% =ignition-msgs5) |\
+Package (% =libignition-msgs5) |\
+Package (% =libignition-msgs5-dev) |\
+Package (% =libignition-msgs5-dbg)), \
+$Version (% 5.8.1-1~*)) |\
+((Package (% =ignition-physics2) |\
+Package (% =libignition-physics2) |\
+Package (% =libignition-physics2-core-dev) |\
+Package (% =libignition-physics2-dartsim) |\
+Package (% =libignition-physics2-dartsim-dev) |\
+Package (% =libignition-physics2-dev) |\
+Package (% =libignition-physics2-mesh-dev) |\
+Package (% =libignition-physics2-sdf-dev) |\
+Package (% =libignition-physics2-tpe) |\
+Package (% =libignition-physics2-tpe-dev) |\
+Package (% =libignition-physics2-tpelib) |\
+Package (% =libignition-physics2-tpelib-dev)), \
+$Version (% 2.5.0-1~*)) |\
+((Package (% =ignition-plugin) |\
+Package (% =libignition-plugin) |\
+Package (% =libignition-plugin-dev)), \
+$Version (% 1.2.1-1~*)) |\
+((Package (% =ignition-rendering3) |\
+Package (% =libignition-rendering3) |\
+Package (% =libignition-rendering3-core-dev) |\
+Package (% =libignition-rendering3-dev) |\
+Package (% =libignition-rendering3-ogre1) |\
+Package (% =libignition-rendering3-ogre1-dev) |\
+Package (% =libignition-rendering3-ogre2) |\
+Package (% =libignition-rendering3-ogre2-dev)), \
+$Version (% 3.6.0-1~*)) |\
+((Package (% =ignition-sensors3) |\
+Package (% =libignition-sensors3) |\
+Package (% =libignition-sensors3-air-pressure) |\
+Package (% =libignition-sensors3-air-pressure-dev) |\
+Package (% =libignition-sensors3-altimeter) |\
+Package (% =libignition-sensors3-altimeter-dev) |\
+Package (% =libignition-sensors3-camera) |\
+Package (% =libignition-sensors3-camera-dev) |\
+Package (% =libignition-sensors3-core-dev) |\
+Package (% =libignition-sensors3-depth-camera) |\
+Package (% =libignition-sensors3-depth-camera-dev) |\
+Package (% =libignition-sensors3-dev) |\
+Package (% =libignition-sensors3-gpu-lidar) |\
+Package (% =libignition-sensors3-gpu-lidar-dev) |\
+Package (% =libignition-sensors3-imu) |\
+Package (% =libignition-sensors3-imu-dev) |\
+Package (% =libignition-sensors3-lidar) |\
+Package (% =libignition-sensors3-lidar-dev) |\
+Package (% =libignition-sensors3-logical-camera) |\
+Package (% =libignition-sensors3-logical-camera-dev) |\
+Package (% =libignition-sensors3-magnetometer) |\
+Package (% =libignition-sensors3-magnetometer-dev) |\
+Package (% =libignition-sensors3-rendering) |\
+Package (% =libignition-sensors3-rendering-dev) |\
+Package (% =libignition-sensors3-rgbd-camera) |\
+Package (% =libignition-sensors3-rgbd-camera-dev) |\
+Package (% =libignition-sensors3-thermal-camera) |\
+Package (% =libignition-sensors3-thermal-camera-dev)), \
+$Version (% 3.3.0-1~*)) |\
+((Package (% =ignition-tools) |\
+Package (% =libignition-tools-dev)), \
+$Version (% 1.4.1-1~*)) |\
+((Package (% =ignition-transport8) |\
+Package (% =libignition-transport8) |\
+Package (% =libignition-transport8-core-dev) |\
+Package (% =libignition-transport8-dbg) |\
+Package (% =libignition-transport8-dev) |\
+Package (% =libignition-transport8-log) |\
+Package (% =libignition-transport8-log-dev)), \
+$Version (% 8.2.1-1~*)) |\
+((Package (% =ogre-2.1) |\
+Package (% =libogre-2.1) |\
+Package (% =libogre-2.1-dev)),
+$Version (% 2.0.9999~20180616~06a386f-3osrf~*)) |\
+((Package (% =sdformat9) |\
+Package (% =libsdformat9) |\
+Package (% =libsdformat9-dbg) |\
+Package (% =libsdformat9-dev) |\
+Package (% =sdformat9-doc) |\
+Package (% =sdformat9-sdf)), \
+$Version (% 9.7.0-1~*)) \
 "

From 7fd65e6b40eb328c07a6122e69f7810b263d9b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Fri, 15 Apr 2022 11:53:18 -0700
Subject: [PATCH 09/10] Update to correct citadel versions of packages.

---
 ...gnition_citadel_gazebo11_ubuntu_focal.yaml | 230 +++++++++---------
 1 file changed, 113 insertions(+), 117 deletions(-)

diff --git a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
index 91eda03a..ae822d5c 100644
--- a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
+++ b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
@@ -17,37 +17,37 @@ filter_formula: "\
 (Package (= ignition-cmake2) |\
  Package (= libignition-cmake2-dev) \
 ), $Version (% 2.12.1-1*) |\
-(Package (= ignition-common4) |\
- Package (= libignition-common4) |\
- Package (= libignition-common4-av) |\
- Package (= libignition-common4-av-dev) |\
- Package (= libignition-common4-core-dev) |\
- Package (= libignition-common4-dev) |\
- Package (= libignition-common4-events) |\
- Package (= libignition-common4-events-dev) |\
- Package (= libignition-common4-graphics) |\
- Package (= libignition-common4-graphics-dev) |\
- Package (= libignition-common4-profiler) |\
- Package (= libignition-common4-profiler-dev) \
-), $Version (% 4.5.0-1*) |\
-(Package (= ignition-fuel-tools6) |\
- Package (= libignition-fuel-tools6) |\
- Package (= libignition-fuel-tools6-dev) \
-), $Version (% 6.2.0-1*) |\
-(Package (= ignition-gazebo5) |\
- Package (= libignition-gazebo5) |\
- Package (= libignition-gazebo5-dbg) |\
- Package (= libignition-gazebo5-dev) |\
- Package (= libignition-gazebo5-plugins) \
-), $Version (% 5.4.0-1*) |\
-(Package (= ignition-gui5) |\
- Package (= libignition-gui5) |\
- Package (= libignition-gui5-dev) \
-), $Version (% 5.5.0-1*) |\
-(Package (= ignition-launch4) |\
- Package (= libignition-launch4) |\
- Package (= libignition-launch4-dev) \
-), $Version (% 4.1.0-1*) |\
+(Package (= ignition-common3) |\
+ Package (= libignition-common3) |\
+ Package (= libignition-common3-av) |\
+ Package (= libignition-common3-av-dev) |\
+ Package (= libignition-common3-core-dev) |\
+ Package (= libignition-common3-dev) |\
+ Package (= libignition-common3-events) |\
+ Package (= libignition-common3-events-dev) |\
+ Package (= libignition-common3-graphics) |\
+ Package (= libignition-common3-graphics-dev) |\
+ Package (= libignition-common3-profiler) |\
+ Package (= libignition-common3-profiler-dev) \
+), $Version (% 3.14.0-1*) |\
+(Package (= ignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4) |\
+ Package (= libignition-fuel-tools4-dev) \
+), $Version (% 4.4.0-1*) |\
+(Package (= ignition-gazebo3) |\
+ Package (= libignition-gazebo3) |\
+ Package (= libignition-gazebo3-dbg) |\
+ Package (= libignition-gazebo3-dev) |\
+ Package (= libignition-gazebo3-plugins) \
+), $Version (% 3.12.0-1*) |\
+(Package (= ignition-gui3) |\
+ Package (= libignition-gui3) |\
+ Package (= libignition-gui3-dev) \
+), $Version (% 3.9.0-1*) |\
+(Package (= ignition-launch2) |\
+ Package (= libignition-launch2) |\
+ Package (= libignition-launch2-dev) \
+), $Version (% 2.2.2-1*) |\
 (Package (= ignition-math6) |\
  Package (= libignition-math6) |\
  Package (= libignition-math6-dbg) |\
@@ -56,90 +56,86 @@ filter_formula: "\
  Package (= python3-ignition-math6) |\
  Package (= ruby-ignition-math6) \
 ), $Version (% 6.10.0-1*) |\
-(Package (= ignition-msgs7) |\
- Package (= libignition-msgs7) |\
- Package (= libignition-msgs7-dev) \
-), $Version (% 7.3.0-1*) |\
-(Package (= ignition-physics4) |\
- Package (= libignition-physics4) |\
- Package (= libignition-physics4-bullet) |\
- Package (= libignition-physics4-bullet-dev) |\
- Package (= libignition-physics4-core-dev) |\
- Package (= libignition-physics4-dartsim) |\
- Package (= libignition-physics4-dartsim-dev) |\
- Package (= libignition-physics4-dev) |\
- Package (= libignition-physics4-heightmap-dev) |\
- Package (= libignition-physics4-mesh-dev) |\
- Package (= libignition-physics4-sdf-dev) |\
- Package (= libignition-physics4-tpe) |\
- Package (= libignition-physics4-tpe-dev) |\
- Package (= libignition-physics4-tpelib) |\
- Package (= libignition-physics4-tpelib-dev) \
-), $Version (% 4.3.0-1*) |\
-(Package (= ignition-rendering5) |\
- Package (= libignition-rendering5) |\
- Package (= libignition-rendering5-core-dev) |\
- Package (= libignition-rendering5-dev) |\
- Package (= libignition-rendering5-ogre1) |\
- Package (= libignition-rendering5-ogre1-dev) |\
- Package (= libignition-rendering5-ogre2) |\
- Package (= libignition-rendering5-ogre2-dev) \
-), $Version (% 5.2.1-1*) |\
-(Package (= ignition-sensors5) |\
- Package (= libignition-sensors5) |\
- Package (= libignition-sensors5-air-pressure) |\
- Package (= libignition-sensors5-air-pressure-dev) |\
- Package (= libignition-sensors5-altimeter) |\
- Package (= libignition-sensors5-altimeter-dev) |\
- Package (= libignition-sensors5-camera) |\
- Package (= libignition-sensors5-camera-dev) |\
- Package (= libignition-sensors5-core-dev) |\
- Package (= libignition-sensors5-depth-camera) |\
- Package (= libignition-sensors5-depth-camera-dev) |\
- Package (= libignition-sensors5-dev) |\
- Package (= libignition-sensors5-gpu-lidar) |\
- Package (= libignition-sensors5-gpu-lidar-dev) |\
- Package (= libignition-sensors5-imu) |\
- Package (= libignition-sensors5-imu-dev) |\
- Package (= libignition-sensors5-lidar) |\
- Package (= libignition-sensors5-lidar-dev) |\
- Package (= libignition-sensors5-logical-camera) |\
- Package (= libignition-sensors5-logical-camera-dev) |\
- Package (= libignition-sensors5-magnetometer) |\
- Package (= libignition-sensors5-magnetometer-dev) |\
- Package (= libignition-sensors5-rendering) |\
- Package (= libignition-sensors5-rendering-dev) |\
- Package (= libignition-sensors5-rgbd-camera) |\
- Package (= libignition-sensors5-rgbd-camera-dev) |\
- Package (= libignition-sensors5-thermal-camera) |\
- Package (= libignition-sensors5-thermal-camera-dev) \
-), $Version (% 5.1.1-1*) |\
-(Package (= ignition-transport10) |\
- Package (= libignition-transport10) |\
- Package (= libignition-transport10-core-dev) |\
- Package (= libignition-transport10-dbg) |\
- Package (= libignition-transport10-dev) |\
- Package (= libignition-transport10-log) |\
- Package (= libignition-transport10-log-dev) \
-), $Version (% 10.2.0-1*) |\
-(Package (= ignition-utils1) |\
- Package (= libignition-utils1) |\
- Package (= libignition-utils1-cli-dev) |\
- Package (= libignition-utils1-dbg) |\
- Package (= libignition-utils1-dev) \
-), $Version (% 1.4.0-1*) |\
-(Package (= ogre-2.2) |\
- Package (= blender-ogrexml-2.2) |\
- Package (= libogre-2.2) |\
- Package (= libogre-2.2-dev) |\
- Package (= ogre-2.2-doc) |\
- Package (= ogre-2.2-tools) \
-), $Version (% 2.2.5+20210824~ec3f70c-4*) |\
-(Package (= sdformat11) |\
- Package (= libsdformat11) |\
- Package (= libsdformat11-dbg) |\
- Package (= libsdformat11-dev) |\
- Package (= sdformat11-doc) |\
- Package (= sdformat11-sdf) \
-), $Version (% 11.4.1-1*) \
+(Package (= ignition-msgs5) |\
+ Package (= libignition-msgs5) |\
+ Package (= libignition-msgs5-dev) \
+), $Version (% 5.9.0-1*) |\
+(Package (= ignition-physics2) |\
+ Package (= libignition-physics2) |\
+ Package (= libignition-physics2-core-dev) |\
+ Package (= libignition-physics2-dartsim) |\
+ Package (= libignition-physics2-dartsim-dev) |\
+ Package (= libignition-physics2-dev) |\
+ Package (= libignition-physics2-mesh-dev) |\
+ Package (= libignition-physics2-sdf-dev) |\
+ Package (= libignition-physics2-tpe) |\
+ Package (= libignition-physics2-tpe-dev) |\
+ Package (= libignition-physics2-tpelib) |\
+ Package (= libignition-physics2-tpelib-dev) \
+), $Version (% 2.5.0-1*) |\
+(Package (= ignition-plugin) |\
+ Package (= libignition-plugin) |\
+ Package (= libignition-plugin-dbg) |\
+ Package (= libignition-plugin-dev) \
+), $Version (% 1.2.1-1*) |\
+(Package (= ignition-rendering3) |\
+ Package (= libignition-rendering3) |\
+ Package (= libignition-rendering3-core-dev) |\
+ Package (= libignition-rendering3-dev) |\
+ Package (= libignition-rendering3-ogre1) |\
+ Package (= libignition-rendering3-ogre1-dev) |\
+ Package (= libignition-rendering3-ogre2) |\
+ Package (= libignition-rendering3-ogre2-dev) \
+), $Version (% 3.6.0-1*) |\
+(Package (= ignition-sensors3) |\
+ Package (= libignition-sensors3) |\
+ Package (= libignition-sensors3-air-pressure) |\
+ Package (= libignition-sensors3-air-pressure-dev) |\
+ Package (= libignition-sensors3-altimeter) |\
+ Package (= libignition-sensors3-altimeter-dev) |\
+ Package (= libignition-sensors3-camera) |\
+ Package (= libignition-sensors3-camera-dev) |\
+ Package (= libignition-sensors3-core-dev) |\
+ Package (= libignition-sensors3-depth-camera) |\
+ Package (= libignition-sensors3-depth-camera-dev) |\
+ Package (= libignition-sensors3-dev) |\
+ Package (= libignition-sensors3-gpu-lidar) |\
+ Package (= libignition-sensors3-gpu-lidar-dev) |\
+ Package (= libignition-sensors3-imu) |\
+ Package (= libignition-sensors3-imu-dev) |\
+ Package (= libignition-sensors3-lidar) |\
+ Package (= libignition-sensors3-lidar-dev) |\
+ Package (= libignition-sensors3-logical-camera) |\
+ Package (= libignition-sensors3-logical-camera-dev) |\
+ Package (= libignition-sensors3-magnetometer) |\
+ Package (= libignition-sensors3-magnetometer-dev) |\
+ Package (= libignition-sensors3-rendering) |\
+ Package (= libignition-sensors3-rendering-dev) |\
+ Package (= libignition-sensors3-rgbd-camera) |\
+ Package (= libignition-sensors3-rgbd-camera-dev) |\
+ Package (= libignition-sensors3-thermal-camera) |\
+ Package (= libignition-sensors3-thermal-camera-dev) \
+), $Version (% 3.3.0-1*) |\
+(Package (= ignition-transport8) |\
+ Package (= libignition-transport8) |\
+ Package (= libignition-transport8-core-dev) |\
+ Package (= libignition-transport8-dbg) |\
+ Package (= libignition-transport8-dev) |\
+ Package (= libignition-transport8-log) |\
+ Package (= libignition-transport8-log-dev) \
+), $Version (% 8.2.1-1*) |\
+(Package (= ogre-2.1) |\
+ Package (= blender-ogrexml-2.1) |\
+ Package (= libogre-2.1) |\
+ Package (= libogre-2.1-dev) |\
+ Package (= ogre-2.1-doc) |\
+ Package (= ogre-2.1-tools) \
+), $Version (% 2.0.9999~20180616~06a386f-3*) |\
+(Package (= sdformat9) |\
+ Package (= libsdformat9) |\
+ Package (= libsdformat9-dbg) |\
+ Package (= libsdformat9-dev) |\
+ Package (= sdformat9-doc) |\
+ Package (= sdformat9-sdf) \
+), $Version (% 9.7.0-1*) \
 "

From 270f39aa8949380d6f4bc61d46dc73a0de81d188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= <steven@nuclearsandwich.com>
Date: Fri, 22 Apr 2022 11:05:02 -0700
Subject: [PATCH 10/10] Re-add ignition tools.

---
 config/ignition_citadel_gazebo11_ubuntu_focal.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
index ae822d5c..1db1598e 100644
--- a/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
+++ b/config/ignition_citadel_gazebo11_ubuntu_focal.yaml
@@ -116,6 +116,9 @@ filter_formula: "\
  Package (= libignition-sensors3-thermal-camera) |\
  Package (= libignition-sensors3-thermal-camera-dev) \
 ), $Version (% 3.3.0-1*) |\
+(Package (= ignition-tools) |\
+ Package (= libignition-tools-dev) \
+), $Version (% 1.4.1-1*) |\
 (Package (= ignition-transport8) |\
  Package (= libignition-transport8) |\
  Package (= libignition-transport8-core-dev) |\