[gnome-software: 1/2] data: Rename the appdata file/directory to metainfo

[Philip Withnall <pwithnall src gnome org>]

commit 8b175f900f83c106a231fbbd6aa9694027cfecea
Author: AsciiWolf <mail asciiwolf com>
Date:   Mon May 9 22:38:06 2022 +0200

    data: Rename the appdata file/directory to metainfo

 RELEASE.md                                              |   6 +++---
 contrib/gnome-software.spec.in                          |   2 +-
 data/meson.build                                        |   2 +-
 data/{appdata => metainfo}/meson.build                  |   4 ++--
 .../org.gnome.Software.metainfo.xml.in}                 |  16 ++++++++--------
 data/{appdata => metainfo}/ss-details.png               | Bin
 data/{appdata => metainfo}/ss-details2.png              | Bin
 data/{appdata => metainfo}/ss-installed.png             | Bin
 data/{appdata => metainfo}/ss-overview.png              | Bin
 data/{appdata => metainfo}/ss-up-to-date.png            | Bin
 data/{appdata => metainfo}/ss-updates-details.png       | Bin
 data/{appdata => metainfo}/ss-updates.png               | Bin
 po/POTFILES.in                                          |   2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/RELEASE.md b/RELEASE.md
index d1a80e390..8cf62a89a 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -35,15 +35,15 @@ gitlab-changelog.py GNOME/gnome-software ${previous_version}..
 ```
 
 Edit this down to just the user visible changes, and list them in
-`data/appdata/org.gnome.Software.appdata.xml.in`. User visible changes are ones
+`data/metainfo/org.gnome.Software.metainfo.xml.in`. User visible changes are ones
 which the average user might be interested to know about, such as a fix for an
 impactful bug, a UI change, or a feature change.
 
-You can get review of your appdata changes from other co-maintainers if you wish.
+You can get review of your metainfo changes from other co-maintainers if you wish.
 
 Generate `NEWS` file:
 ```
-appstreamcli metainfo-to-news ./data/appdata/org.gnome.Software.appdata.xml.in ./NEWS
+appstreamcli metainfo-to-news ./data/metainfo/org.gnome.Software.metainfo.xml.in ./NEWS
 ```
 
 Commit the release:
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index f79448567..55f2a6470 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -143,7 +143,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/scalable/status/software-installed-symbolic.svg
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
-%{_datadir}/metainfo/org.gnome.Software.appdata.xml
+%{_datadir}/metainfo/org.gnome.Software.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
 %dir %{gs_plugin_dir}
diff --git a/data/meson.build b/data/meson.build
index 7472f393b..6fd5060a6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-subdir('appdata')
+subdir('metainfo')
 subdir('icons')
 subdir('assets')
 
diff --git a/data/appdata/meson.build b/data/metainfo/meson.build
similarity index 63%
rename from data/appdata/meson.build
rename to data/metainfo/meson.build
index b3e908b9d..d065c43ab 100644
--- a/data/appdata/meson.build
+++ b/data/metainfo/meson.build
@@ -1,6 +1,6 @@
 i18n.merge_file(
-  input: 'org.gnome.Software.appdata.xml.in',
-  output: 'org.gnome.Software.appdata.xml',
+  input: 'org.gnome.Software.metainfo.xml.in',
+  output: 'org.gnome.Software.metainfo.xml',
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
diff --git a/data/appdata/org.gnome.Software.appdata.xml.in b/data/metainfo/org.gnome.Software.metainfo.xml.in
similarity index 99%
rename from data/appdata/org.gnome.Software.appdata.xml.in
rename to data/metainfo/org.gnome.Software.metainfo.xml.in
index 4d5022c17..125540f9d 100644
--- a/data/appdata/org.gnome.Software.appdata.xml.in
+++ b/data/metainfo/org.gnome.Software.metainfo.xml.in
@@ -21,31 +21,31 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-overview.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-overview.png</image>
       <caption>Overview panel</caption>
     </screenshot>
     <screenshot>
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-details.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-details.png</image>
       <caption>Details panel</caption>
     </screenshot>
     <screenshot>
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-details2.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-details2.png</image>
       <caption>Details panel</caption>
     </screenshot>
     <screenshot>
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-installed.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-installed.png</image>
       <caption>Installed panel</caption>
     </screenshot>
     <screenshot>
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-up-to-date.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-up-to-date.png</image>
       <caption>Updates panel</caption>
     </screenshot>
     <screenshot>
-      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-updates.png</image>
+      <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-updates.png</image>
       <caption>Updates panel</caption>
     </screenshot>
     <screenshot>
-      
<image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-updates-details.png</image>
+      
<image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/metainfo/ss-updates-details.png</image>
       <caption>The update details</caption>
     </screenshot>
   </screenshots>
@@ -63,7 +63,7 @@
   </requires>
 
   <!--
-   Validate with `appstreamcli validate *.appdata.xml`
+   Validate with `appstreamcli validate *.metainfo.xml`
   -->
   <releases>
     <release date="2022-05-06" version="43.alpha" type="unstable">
diff --git a/data/appdata/ss-details.png b/data/metainfo/ss-details.png
similarity index 100%
rename from data/appdata/ss-details.png
rename to data/metainfo/ss-details.png
diff --git a/data/appdata/ss-details2.png b/data/metainfo/ss-details2.png
similarity index 100%
rename from data/appdata/ss-details2.png
rename to data/metainfo/ss-details2.png
diff --git a/data/appdata/ss-installed.png b/data/metainfo/ss-installed.png
similarity index 100%
rename from data/appdata/ss-installed.png
rename to data/metainfo/ss-installed.png
diff --git a/data/appdata/ss-overview.png b/data/metainfo/ss-overview.png
similarity index 100%
rename from data/appdata/ss-overview.png
rename to data/metainfo/ss-overview.png
diff --git a/data/appdata/ss-up-to-date.png b/data/metainfo/ss-up-to-date.png
similarity index 100%
rename from data/appdata/ss-up-to-date.png
rename to data/metainfo/ss-up-to-date.png
diff --git a/data/appdata/ss-updates-details.png b/data/metainfo/ss-updates-details.png
similarity index 100%
rename from data/appdata/ss-updates-details.png
rename to data/metainfo/ss-updates-details.png
diff --git a/data/appdata/ss-updates.png b/data/metainfo/ss-updates.png
similarity index 100%
rename from data/appdata/ss-updates.png
rename to data/metainfo/ss-updates.png
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cfd24014..4decd2c93 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-data/appdata/org.gnome.Software.appdata.xml.in
+data/metainfo/org.gnome.Software.metainfo.xml.in
 data/org.gnome.software.external-appstream.policy.in.in
 data/org.gnome.software.gschema.xml
 gs-install-appstream/gs-install-appstream.c