From b26f8f06b61305e2d3c61fba6b28f2ae1c97958a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 20 Jul 2023 11:22:02 -0700
Subject: [PATCH 1/3] Metainfo Improvements

---
 data/meson.build          |   6 +--
 data/sound.appdata.xml.in | 107 --------------------------------------
 po/extra/POTFILES         |   2 +-
 3 files changed, 4 insertions(+), 111 deletions(-)
 delete mode 100644 data/sound.appdata.xml.in

diff --git a/data/meson.build b/data/meson.build
index 9607e7a5..c1f18b5a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,8 +1,8 @@
 i18n.merge_file(
-    input: 'sound.appdata.xml.in',
+    input: 'sound.metainfo.xml.in',
     output: 'io.elementary.switchboard.sound.appdata.xml',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: meson.source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
-    install_dir: join_paths(datadir, 'metainfo'),
+    install_dir: datadir / 'metainfo',
 )
diff --git a/data/sound.appdata.xml.in b/data/sound.appdata.xml.in
deleted file mode 100644
index 6fc8a313..00000000
--- a/data/sound.appdata.xml.in
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="addon">
-  <id>io.elementary.switchboard.sound</id>
-  <extends>io.elementary.switchboard</extends>
-  <name>Sound Settings</name>
-  <summary>Change sound and microphone volume</summary>
-  <icon type="stock">preferences-desktop-sound</icon>
-  <translation type="gettext">sound-plug</translation>
-  <releases>
-    <release version="2.3.2" date="2022-10-26" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Use device form factor when available to assign more accurate icons</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-      <issues>
-        <issue url="https://github.com/elementary/switchboard-plug-sound/pull/225">Fix switch animation when muting</issue>
-      </issues>
-    </release>
-
-    <release version="2.3.1" date="2022-04-06" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Provide a fallback device icon in case none is available</li>
-          <li>More helpful placeholder text when no input devices are found</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.3.0" date="2021-11-23" urgency="medium">
-      <description>
-        <p>New features:</p>
-        <ul>
-          <li>Show device icons</li>
-          <li>Switch to enable the screen reader</li>
-        </ul>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.7" date="2021-07-14" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.6" date="2020-12-23" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Smoother transition when navigating away from this view</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.5" date="2020-09-02" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Fix crash with PulseAudio's echo cancellation plugin</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.4" date="2020-05-28" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.3" date="2020-04-03" urgency="medium">
-      <description>
-        <p>Minor updates:</p>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.2" date="2019-11-15" urgency="medium">
-      <description>
-        <ul>
-          <li>Add volume slider event sound</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-  </releases>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-sound/master/data/screenshot.png</image>
-    </screenshot>
-  </screenshots>
-  <developer_name>elementary, Inc.</developer_name>
-  <url type="homepage">https://elementary.io</url>
-  <url type="bugtracker">https://github.com/elementary/switchboard-plug-sound/issues</url>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-</component>
diff --git a/po/extra/POTFILES b/po/extra/POTFILES
index 7bcc230b..644f5d4e 100644
--- a/po/extra/POTFILES
+++ b/po/extra/POTFILES
@@ -1 +1 @@
-data/sound.appdata.xml.in
+data/sound.metainfo.xml.in

From 4be975ecd5a9555b9d696eac9653c5233f82794f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 20 Jul 2023 11:23:52 -0700
Subject: [PATCH 2/3] Update meson.build

---
 data/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/meson.build b/data/meson.build
index c1f18b5a..77ac57ee 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
 i18n.merge_file(
     input: 'sound.metainfo.xml.in',
-    output: 'io.elementary.switchboard.sound.appdata.xml',
+    output: 'io.elementary.switchboard.sound.metainfo.xml',
     po_dir: meson.source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,

From 3133f84e50bd2da356319799b4d513b5734e37cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 20 Jul 2023 11:24:11 -0700
Subject: [PATCH 3/3] add missing file

---
 data/sound.metainfo.xml.in | 92 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 data/sound.metainfo.xml.in

diff --git a/data/sound.metainfo.xml.in b/data/sound.metainfo.xml.in
new file mode 100644
index 00000000..cf2cddd2
--- /dev/null
+++ b/data/sound.metainfo.xml.in
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>io.elementary.switchboard.sound</id>
+  <extends>io.elementary.switchboard</extends>
+  <translation type="gettext">sound-plug</translation>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+
+  <icon type="stock">preferences-desktop-sound</icon>
+  <name>Sound Settings</name>
+  <summary>Change sound and microphone volume</summary>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-sound/master/data/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="bugtracker">https://github.com/elementary/switchboard-plug-sound/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/switchboard-plug-sound/discussions</url>
+  <url type="homepage">https://elementary.io/</url>
+  <url type="translate">https://l10n.elementary.io/engage/switchboard/</url>
+
+  <developer_name>elementary, Inc.</developer_name>
+  <project_group>elementary</project_group>
+  <update_contact>contact_at_elementary.io</update_contact>
+
+  <releases>
+    <release version="2.3.2" date="2022-10-26" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Use device form factor when available to assign more accurate icons</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/switchboard-plug-sound/pull/225">Fix switch animation when muting</issue>
+      </issues>
+    </release>
+
+    <release version="2.3.1" date="2022-04-06" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Provide a fallback device icon in case none is available</li>
+          <li>More helpful placeholder text when no input devices are found</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="2.3.0" date="2021-11-23" urgency="medium">
+      <description>
+        <p>New features:</p>
+        <ul>
+          <li>Show device icons</li>
+          <li>Switch to enable the screen reader</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="2.2.7" date="2021-07-14" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="2.2.6" date="2020-12-23" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Smoother transition when navigating away from this view</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="2.2.5" date="2020-09-02" />
+    <release version="2.2.4" date="2020-05-28" />
+    <release version="2.2.3" date="2020-04-03" />
+    <release version="2.2.2" date="2019-11-15" />
+  </releases>
+</component>