Metainfo Improvements (#450)

data/io.elementary.switchboard.keyboard.appdata.xml.in → data/keyboard.metainfo.xml.in

@@ -2,10 +2,37 @@
 <component type="addon">
   <id>io.elementary.switchboard.keyboard</id>
   <extends>io.elementary.switchboard</extends>
+  <translation type="gettext">keyboard-plug</translation>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+
+  <icon type="stock">preferences-desktop-keyboard</icon>
   <name>Keyboard Settings</name>
   <summary>Configure keyboard behavior, layouts, and shortcuts</summary>
-  <icon type="stock">preferences-desktop-keyboard</icon>
-  <translation type="gettext">keyboard-plug</translation>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot-shortcuts.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot-behavior.png</image>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.1" />
+
+  <url type="homepage">https://elementary.io/</url>
+  <url type="bugtracker">https://github.com/elementary/switchboard-plug-keyboard/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/switchboard-plug-keyboard/discussions</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="3.1.1" date="2023-01-05" urgency="medium">
@@ -73,20 +100,4 @@
       </description>
     </release>
   </releases>
-
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot-shortcuts.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-keyboard/master/data/screenshot-behavior.png</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://elementary.io</url>
-  <url type="bugtracker">https://github.com/elementary/switchboard-plug-keyboard/issues</url>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
 </component>

data/meson.build

@@ -1,7 +1,8 @@
 i18n.merge_file(
-    input: 'io.elementary.switchboard.keyboard.appdata.xml.in',
-    output: 'io.elementary.switchboard.keyboard.appdata.xml',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
-    install_dir: join_paths(datadir, 'metainfo'),
-    install: true
+    input: 'keyboard.metainfo.xml.in',
+    output: 'io.elementary.switchboard.keyboard.metainfo.xml',
+    po_dir: meson.source_root() / 'po' / 'extra',
+    type: 'xml',
+    install: true,
+    install_dir: datadir / 'metainfo'
 )

po/extra/POTFILES

@@ -1 +1 @@
-data/io.elementary.switchboard.keyboard.appdata.xml.in
+data/keyboard.metainfo.xml.in