diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index 58cdb28b..e8e9e138 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -60,7 +60,7 @@ parts: fractal: after: [gspell] - parse-info: [usr/share/metainfo/org.gnome.Fractal.appdata.xml] + parse-info: [usr/share/metainfo/org.gnome.Fractal.metainfo.xml] source: . plugin: meson meson-parameters: [--prefix=/usr] diff --git a/fractal-gtk/po/POTFILES.in b/fractal-gtk/po/POTFILES.in index e9d00d8f..10a8c871 100644 --- a/fractal-gtk/po/POTFILES.in +++ b/fractal-gtk/po/POTFILES.in @@ -1,9 +1,9 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. fractal-gtk/res/gtk/help-overlay.ui -fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in fractal-gtk/res/org.gnome.Fractal.desktop.in.in fractal-gtk/res/org.gnome.Fractal.gschema.xml +fractal-gtk/res/org.gnome.Fractal.metainfo.xml.in.in # ui files fractal-gtk/res/ui/account_settings.ui diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build index df07d3d8..b269e723 100644 --- a/fractal-gtk/res/meson.build +++ b/fractal-gtk/res/meson.build @@ -26,15 +26,15 @@ if desktop_file_validate.found() endif -appdata_conf = configuration_data() -appdata_conf.set('appid', application_id) -appdata_file = i18n.merge_file ('appdata-file', +metainfo_conf = configuration_data() +metainfo_conf.set('appid', application_id) +metainfo_file = i18n.merge_file ('metainfo-file', input: configure_file( - input: files('org.gnome.Fractal.appdata.xml.in.in'), - output: 'org.gnome.Fractal.appdata.xml.in', - configuration: appdata_conf + input: files('org.gnome.Fractal.metainfo.xml.in.in'), + output: 'org.gnome.Fractal.metainfo.xml.in', + configuration: metainfo_conf ), - output: '@0@.appdata.xml'.format(application_id), + output: '@0@.metainfo.xml'.format(application_id), po_dir: podir, install: true, install_dir: join_paths (datadir, 'metainfo') @@ -42,9 +42,9 @@ appdata_file = i18n.merge_file ('appdata-file', appstream_util = find_program('appstream-util', required: false) if appstream_util.found() test( - 'validate-appdata', appstream_util, + 'validate-metainfo', appstream_util, args: [ - 'validate-relax', '--nonet', appdata_file.full_path() + 'validate-relax', '--nonet', metainfo_file.full_path() ] ) endif diff --git a/fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in b/fractal-gtk/res/org.gnome.Fractal.metainfo.xml.in.in similarity index 100% rename from fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in rename to fractal-gtk/res/org.gnome.Fractal.metainfo.xml.in.in diff --git a/scripts/new-release.sh b/scripts/new-release.sh index 5704a4c2..66396ac4 100755 --- a/scripts/new-release.sh +++ b/scripts/new-release.sh @@ -24,7 +24,7 @@ esac sed -i "s/$current/$next/" meson.build sed -i "s/$current/$next/" fractal-gtk/Cargo.toml sed -i "s/$current/$next/" fractal-matrix-api/Cargo.toml -sed -i "s/version=\"$current\".*/version=\"$next\" date=\"$(date +%Y-%m-%d)\"\/>/" fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in +sed -i "s/version=\"$current\".*/version=\"$next\" date=\"$(date +%Y-%m-%d)\"\/>/" fractal-gtk/res/org.gnome.Fractal.metainfo.xml.in.in cargo check