Merge branch 'fix-appdata' into 'master'

data/meson.build

@@ -16,12 +16,14 @@ metainfo_file = i18n.merge_file (
   install_dir: datadir / 'metainfo'
 )
 # Validate metainfo
-if appstream_util.found()
+if appstreamcli.found()
   test(
-    'validate-metainfo', appstream_util,
+    'validate-metainfo',
+    appstreamcli,
     args: [
-      'validate', '--nonet', metainfo_file.full_path()
-    ]
+      'validate', '--no-net', '--explain', metainfo_file
+    ],
+    workdir: meson.current_build_dir()
   )
 endif
 

data/org.gnome.Tour.metainfo.xml.in.in

@@ -19,7 +19,9 @@
   </screenshots>
   <url type="homepage">https://gitlab.gnome.org/GNOME/gnome-tour</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-tour/issues</url>
-  <url type="donation">http://www.gnome.org/friends/</url>
+  <url type="donation">https://www.gnome.org/donate/</url>
+  <url type="translate">https://l10n.gnome.org/module/gnome-tour/</url>
+  <url type="vcs-browser">https://gitlab.gnome.org/GNOME/gnome-tour</url>
   <content_rating type="oars-1.1" />
   <releases>
     <release version="44.0" date="2023-03-20" />
@@ -39,7 +41,11 @@
     <kudo>HiDpiIcon</kudo>
   </kudos>
   <project_group>GNOME</project_group>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name>The GNOME Project</developer_name>
+  <developer id="gnome.org">
+    <name>The GNOME Project</name>
+  </developer>
   <update_contact>bilal.elmoussaoui@gnome.org</update_contact>
   <translation type="gettext">@gettext-package@</translation>
   <launchable type="desktop-id">@app-id@.desktop</launchable>

meson.build

@@ -17,7 +17,7 @@ dependency('libadwaita-1', version: '>= 1')
 
 glib_compile_resources = find_program('glib-compile-resources', required: true)
 desktop_file_validate = find_program('desktop-file-validate', required: false)
-appstream_util = find_program('appstream-util', required: false)
+appstreamcli = find_program('appstreamcli', required: false)
 cargo = find_program('cargo')
 
 version = meson.project_version()