From 743577757f7aaf83700a5312d2d8dcd23f5da9ad Mon Sep 17 00:00:00 2001
From: AsciiWolf <mail@asciiwolf.com>
Date: Thu, 6 Oct 2022 16:22:38 +0200
Subject: [PATCH] data: Rename appdata to metainfo

The appdata file/directory name is deprecated.

Also change the desktop component type to desktop-application. Same reason.
---
 data/meson.build                                          | 8 ++++----
 ...pdata.xml.in.in => org.gnome.Loupe.metainfo.xml.in.in} | 2 +-
 po/POTFILES                                               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename data/{org.gnome.Loupe.appdata.xml.in.in => org.gnome.Loupe.metainfo.xml.in.in} (86%)

diff --git a/data/meson.build b/data/meson.build
index 70bb9d1..ef153bf 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -28,14 +28,14 @@ endif
 
 appstream_file = i18n.merge_file(
   input: configure_file(
-    input: 'org.gnome.Loupe.appdata.xml.in.in',
-    output: 'org.gnome.Loupe.appdata.xml.in',
+    input: 'org.gnome.Loupe.metainfo.xml.in.in',
+    output: 'org.gnome.Loupe.metainfo.xml.in',
     configuration: conf,
   ),
-  output: '@0@.appdata.xml'.format(app_id),
+  output: '@0@.metainfo.xml'.format(app_id),
   po_dir: '../po',
   install: true,
-  install_dir: iv_datadir / 'appdata'
+  install_dir: iv_datadir / 'metainfo'
 )
 
 # appstream_util = find_program('appstream-util', required: false)
diff --git a/data/org.gnome.Loupe.appdata.xml.in.in b/data/org.gnome.Loupe.metainfo.xml.in.in
similarity index 86%
rename from data/org.gnome.Loupe.appdata.xml.in.in
rename to data/org.gnome.Loupe.metainfo.xml.in.in
index 146aae8..ba7b769 100644
--- a/data/org.gnome.Loupe.appdata.xml.in.in
+++ b/data/org.gnome.Loupe.metainfo.xml.in.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
+<component type="desktop-application">
   <id>@APP_ID@.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
diff --git a/po/POTFILES b/po/POTFILES
index f5ee6c9..422968a 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -4,9 +4,9 @@ data/gtk/image_view.ui
 data/gtk/properties_view.ui
 data/gtk/window.ui
 data/org.gnome.Loupe.desktop.in
-data/org.gnome.Loupe.appdata.xml.in
+data/org.gnome.Loupe.metainfo.xml.in
 data/org.gnome.Loupe.gschema.xml
 src/widgets/image_view.rs
 src/widgets/properties_view.rs
 src/widgets/application.rs
-src/widgets/window.rs
\ No newline at end of file
+src/widgets/window.rs