appdata: Improve appdata for AppStream 1.0

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Mark the developer name as untranslatable
- Remove unreachable donation URL
- Remove one of Purism tag to pass appstreamcli validation
- Fix release descriptions
- Use appstreamcli to validate appdata

data/com.belmoussaoui.Authenticator.metainfo.xml.in.in

@@ -44,32 +44,38 @@
   <url type="homepage">https://gitlab.gnome.org/World/Authenticator</url>
   <url type="bugtracker">https://gitlab.gnome.org/World/Authenticator/issues</url>
   <url type="translate">https://l10n.gnome.org/module/authenticator/</url>
-  <url type="donation">https://liberapay.com/bielmoussaoui</url>
   <url type="vcs-browser">https://gitlab.gnome.org/World/Authenticator</url>
   <content_rating type="oars-1.1" />
   <releases>
     <release version="4.4.0" date="2023-10-13">
+      <description>
         <ul>
           <li>Display an error dialog when the application fails to use the keyring</li>
           <li>Use new Adwaita widgets</li>
           <li>Camera improvements thanks to Aperture, the library used by Snapshot</li>
         </ul>
+      </description>
     </release>
     <release version="4.3.1" date="2023-04-22">
+      <description>
         <ul>
           <li>Add support for rotated camera</li>
           <li>Prefer front camera when possible</li>
         </ul>
+      </description>
     </release>
     <release version="4.3.0" date="2023-04-20">
+      <description>
         <ul>
-        <li>Fix compatibility with https://2fas.com/check-token/</li>
+          <li>Fix compatibility with 2fas.com/check-token/</li>
           <li>backup: Add FreeOTP+ JSON format support</li>
           <li>Allow importing from an image file containing a QR code</li>
           <li>Add tests for all the supported backup formats</li>
         </ul>
+      </description>
     </release>
     <release version="4.2.0" date="2022-12-27">
+      <description>
         <ul>
           <li>Mutli Camera support when scanning a QR code</li>
           <li>Camera: Use GL when possible</li>
@@ -79,12 +85,15 @@
           <li>Update providers list</li>
           <li>Use new libadwaita widgets</li>
         </ul>
+      </description>
     </release>
     <release version="4.1.6" date="2022-06-10">
+      <description>
       <ul>
         <li>Add Google Autenticator restore support</li>
         <li>Disable Inspector on release builds</li>
       </ul>
+      </description>
     </release>
     <release version="4.1.5" date="2022-06-06">
       <description>Fix a crash when loading an account token</description>
@@ -96,7 +105,8 @@
       <description>Fallback to host keyring in case the portal is not available</description>
     </release>
     <release version="4.1.2" date="2022-05-29">
-      <description>Bugfixes release</description>
+      <description>
+        <p>Bugfixes release</p>
         <ul>
           <li>Fix a failure when importing from andOTP</li>
           <li>Fix importing from Aegis if the database was encrypted with biometrics</li>
@@ -104,9 +114,11 @@
           <li>Fix QR code scanning from a screenshot</li>
           <li>Translations updates and other bugfixes</li>
         </ul>
+      </description>
     </release>
     <release version="4.1.1" date="2022-04-22">
-      <description>Bugfixes release</description>
+      <description>
+        <p>Bugfixes release</p>
         <ul>
           <li>Restore the copy button</li>
           <li>Add feedback when copying generated codes</li>
@@ -115,9 +127,11 @@
           <li>Fix Aegis backup restore if generated from a phone with a biometric key</li>
           <li>Fixes a crash</li>
         </ul>
+      </description>
     </release>
     <release version="4.1.0" date="2022-04-19">
-      <description>Encrypted backups are finally here!</description>
+      <description>
+        <p>Encrypted backups are finally here!</p>
         <ul>
           <li>Port to GTK 4</li>
           <li>Encrypted backup support</li>
@@ -129,6 +143,7 @@
           <li>Translations updates</li>
           <li>Updated providers database</li>
         </ul>
+      </description>
     </release>
     <release version="4.0.3" date="2021-03-26">
       <description>
@@ -301,12 +316,15 @@
   <provides>
     <id>com.github.bilelmoussaoui.Authenticator</id>
   </provides>
-  <developer_name>Bilal Elmoussaoui</developer_name>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
+  <developer_name translatable="no">Bilal Elmoussaoui</developer_name>
+  <developer id="gnome.org">
+    <name translatable="no">Bilal Elmoussaoui</name>
+  </developer>
   <update_contact>bilal.elmoussaoui@gnome.org</update_contact>
   <translation type="gettext">@gettext-package@</translation>
   <launchable type="desktop-id">@app-id@.desktop</launchable>
   <custom>
-    <value key="Purism::form_factor">workstation</value>
     <value key="Purism::form_factor">mobile</value>
   </custom>
 </component>

data/meson.build

@@ -69,12 +69,13 @@ metainfo_file = i18n.merge_file(
   install_dir: get_option('datadir') / 'metainfo'
 )
 # Validate metainfo File
-appstream_util = find_program('appstream-util', required: false)
+appstreamcli = find_program('appstreamcli', required: false)
-if appstream_util.found()
+if appstreamcli.found()
   test (
     'Validate metainfo file',
-    appstream_util,
+    appstreamcli,
-    args: ['validate-relax', '--nonet', metainfo_file.full_path()]
+    args: ['validate', '--no-net', '--explain', metainfo_file],
+    workdir: meson.current_build_dir()
   )
 endif