From b897da59146cf9351fbd4245f10e26582057b08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 16 May 2024 10:32:44 -0700
Subject: [PATCH] Metainfo Improvements (#143)

---
 data/meson.build                      |   4 +-
 data/shortcut-overlay.appdata.xml.in  | 116 --------------------------
 data/shortcut-overlay.metainfo.xml.in |  92 ++++++++++++++++++++
 po/extra/POTFILES                     |   2 +-
 4 files changed, 95 insertions(+), 119 deletions(-)
 delete mode 100644 data/shortcut-overlay.appdata.xml.in
 create mode 100644 data/shortcut-overlay.metainfo.xml.in

diff --git a/data/meson.build b/data/meson.build
index 09feaa78..9a421774 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
 i18n.merge_file (
-    input: 'shortcut-overlay.appdata.xml.in',
-    output: meson.project_name() + '.appdata.xml',
+    input: 'shortcut-overlay.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
     po_dir: join_paths(meson.source_root(), 'po', 'extra'),
     type: 'xml',
     install: true,
diff --git a/data/shortcut-overlay.appdata.xml.in b/data/shortcut-overlay.appdata.xml.in
deleted file mode 100644
index e396bcee..00000000
--- a/data/shortcut-overlay.appdata.xml.in
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 elementary, Inc. <contact@elementary.io> -->
-<component type="desktop-application">
-  <id>io.elementary.shortcut-overlay</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>Shortcuts</name>
-  <summary>View system shortcuts</summary>
-  <description>
-    <p></p>
-  </description>
-  <releases>
-    <release version="2.0.1" date="2022-10-26">
-      <description>
-        <ul>
-          <li>Show in the applications menu</li>
-          <li>Replace keyboard settings button with a labeled link button</li>
-          <li>Show on-screen keyboard shortcut</li>
-          <li>Close with the shortcut Ctrl + Q</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-
-    <release version="2.0.0" date="2022-05-12" urgency="low">
-      <description>
-        <ul>
-          <li>Update for OS 7 and Gtk 4</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.2.1" date="2021-10-29" urgency="low">
-      <description>
-        <ul>
-          <li>Fix the app not launching if a shortcut key is set to blank</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.2.0" date="2021-07-14" urgency="medium">
-      <description>
-        <ul>
-          <li>Add screenshot shortcuts</li>
-          <li>Fix issues with multiple windows</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.1.2" date="2020-05-28" urgency="medium">
-      <description>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.1.1" date="2020-04-02" urgency="medium">
-      <description>
-        <ul>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.1.0" date="2019-11-15" urgency="medium">
-      <description>
-        <ul>
-          <li>Add "Switch Layout" and "Close Window", shortcuts</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-  </releases>
-  <provides>
-    <binary>io.elementary.shortcut-overlay</binary>
-  </provides>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/shortcut-overlay/master/data/screenshot.png</image>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1">
-    <content_attribute id="violence-cartoon">none</content_attribute>
-    <content_attribute id="violence-fantasy">none</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
-    <content_attribute id="violence-bloodshed">none</content_attribute>
-    <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="violence-desecration">none</content_attribute>
-    <content_attribute id="violence-slavery">none</content_attribute>
-    <content_attribute id="violence-worship">none</content_attribute>
-    <content_attribute id="drugs-alcohol">none</content_attribute>
-    <content_attribute id="drugs-narcotics">none</content_attribute>
-    <content_attribute id="drugs-tobacco">none</content_attribute>
-    <content_attribute id="sex-nudity">none</content_attribute>
-    <content_attribute id="sex-themes">none</content_attribute>
-    <content_attribute id="sex-homosexuality">none</content_attribute>
-    <content_attribute id="sex-prostitution">none</content_attribute>
-    <content_attribute id="sex-adultery">none</content_attribute>
-    <content_attribute id="sex-appearance">none</content_attribute>
-    <content_attribute id="language-profanity">none</content_attribute>
-    <content_attribute id="language-humor">none</content_attribute>
-    <content_attribute id="language-discrimination">none</content_attribute>
-    <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
-    <content_attribute id="social-audio">none</content_attribute>
-    <content_attribute id="social-location">none</content_attribute>
-    <content_attribute id="social-contacts">none</content_attribute>
-    <content_attribute id="money-purchasing">none</content_attribute>
-    <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
-  <translation type="gettext">io.elementary.shortcut-overlay</translation>
-  <developer id="org.elementaryos">
-    <name>elementary, Inc.</name>
-  </developer>
-  <url type="homepage">http://elementary.io</url>
-  <url type="bugtracker">https://github.com/elementary/shortcut-overlay/issues</url>
-</component>
diff --git a/data/shortcut-overlay.metainfo.xml.in b/data/shortcut-overlay.metainfo.xml.in
new file mode 100644
index 00000000..f38623f4
--- /dev/null
+++ b/data/shortcut-overlay.metainfo.xml.in
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019-2024 elementary, Inc. <contact@elementary.io> -->
+<component type="desktop-application">
+  <id>io.elementary.shortcut-overlay</id>
+  <launchable type="desktop-id">io.elementary.shortcut-overlay</launchable>
+  <translation type="gettext">io.elementary.shortcut-overlay</translation>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+
+  <name>Shortcuts</name>
+  <summary>View system shortcuts</summary>
+  <description>
+    <p></p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/shortcut-overlay/master/data/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.1" />
+
+  <provides>
+    <binary>io.elementary.shortcut-overlay</binary>
+  </provides>
+
+  <url type="homepage">https://elementary.io/</url>
+  <url type="bugtracker">https://github.com/elementary/shortcut-overlay/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/shortcut-overlay/discussions</url>
+  <url type="translate">https://l10n.elementary.io/engage/desktop/</url>
+
+  <developer id="org.elementaryos">
+    <name>elementary, Inc.</name>
+  </developer>
+  <project_group>elementary</project_group>
+  <update_contact>contact_at_elementary.io</update_contact>
+
+  <releases>
+    <release version="2.0.1" date="2022-10-26">
+      <description>
+        <ul>
+          <li>Show in the applications menu</li>
+          <li>Replace keyboard settings button with a labeled link button</li>
+          <li>Show on-screen keyboard shortcut</li>
+          <li>Close with the shortcut Ctrl + Q</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="2.0.0" date="2022-05-12" urgency="low">
+      <description>
+        <ul>
+          <li>Update for OS 7 and Gtk 4</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="1.2.1" date="2021-10-29" urgency="low">
+      <description>
+        <ul>
+          <li>Fix the app not launching if a shortcut key is set to blank</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="1.2.0" date="2021-07-14" urgency="medium">
+      <description>
+        <ul>
+          <li>Add screenshot shortcuts</li>
+          <li>Fix issues with multiple windows</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="1.1.2" date="2020-05-28" urgency="medium">
+      <description>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="1.1.1" date="2020-04-02" urgency="medium" />
+    <release version="1.1.0" date="2019-11-15" urgency="medium" />
+  </releases>
+</component>
diff --git a/po/extra/POTFILES b/po/extra/POTFILES
index a069e513..8969220d 100644
--- a/po/extra/POTFILES
+++ b/po/extra/POTFILES
@@ -1,2 +1,2 @@
 data/shortcut-overlay.desktop.in
-data/shortcut-overlay.appdata.xml.in
+data/shortcut-overlay.metainfo.xml.in