[gimp] desktop: fix the data-extras AppStream file.

[Jehan <jehanp src gnome org>]

commit 1691d9b8bcd47f8e93c6eaae1de36bba5e933da0
Author: Jehan <jehan girinstud io>
Date:   Tue May 3 22:19:12 2022 +0200

    desktop: fix the data-extras AppStream file.
    
    appstreamcli was returning the error:
    
    > E: gimp-data-extras:3: cid-is-not-rdns gimp-data-extras
    
    Apparently non-desktop component must absolutely follow the schema with
    a unique identifier with 3 parts or more.
    
    As advised in the spec, let's use the main desktop component ID, adding
    a specific subpart.
    
    Also use underscore rather than hyphen for maximum compatibility.
    See: https://freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic
    
    Finally for addons, share/metainfo/ is the recommended install path.
    See: https://freedesktop.org/software/appstream/docs/sect-Metadata-Addon.html

 configure.ac                                                          | 2 +-
 desktop/.gitignore                                                    | 4 ++--
 desktop/Makefile.am                                                   | 2 +-
 desktop/meson.build                                                   | 4 ++--
 ...etainfo.xml.in.in => org.gimp.GIMP.data_extras.metainfo.xml.in.in} | 2 +-
 desktop/test-appdata.sh.in                                            | 2 +-
 po/POTFILES.in                                                        | 2 +-
 po/POTFILES.skip                                                      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d0cd76496a..09299a1f01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3212,7 +3212,7 @@ data/tool-presets/Paint/Makefile
 data/tool-presets/Selection/Makefile
 data/tool-presets/Sketch/Makefile
 desktop/Makefile
-desktop/gimp-data-extras.metainfo.xml.in
+desktop/org.gimp.GIMP.data_extras.metainfo.xml.in
 desktop/gimp.desktop.in
 desktop/org.gimp.GIMP.appdata.xml.in
 desktop/test-appdata.sh
diff --git a/desktop/.gitignore b/desktop/.gitignore
index 58c6841846..cc57f475d9 100644
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -4,7 +4,7 @@
 /org.gimp.GIMP.appdata.xml
 /gimp.desktop.in
 /gimp.desktop
-/gimp-data-extras.metainfo.xml.in
-/gimp-data-extras.metainfo.xml
+/org.gimp.GIMP.data_extras.metainfo.xml.in
+/org.gimp.GIMP.data_extras.metainfo.xml
 /test-appdata.sh
 /.thumbnails
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index ffb3386e07..f076920d01 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -7,7 +7,7 @@ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
 
 appstream_in_files = \
        org.gimp.GIMP.appdata.xml.in    \
-       gimp-data-extras.metainfo.xml.in
+       org.gimp.GIMP.data_extras.metainfo.xml.in
 
 appstream_files = $(appstream_in_files:.xml.in=.xml)
 
diff --git a/desktop/meson.build b/desktop/meson.build
index e6c24f0fb4..34919da574 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -71,7 +71,7 @@ appdatafile = custom_target(appdatafilename,
   install_dir: get_option('datadir') / 'metainfo',
 )
 
-metainfofilename = 'gimp-data-extras.metainfo.xml'
+metainfofilename = 'org.gimp.GIMP.data_extras.metainfo.xml'
 metainfofilein = configure_file(
   input : metainfofilename+'.in.in',
   output: metainfofilename+'.in',
@@ -90,7 +90,7 @@ metainfofile = custom_target(metainfofilename,
     '--cache=' + '@OUTDIR@' / 'intltool-merge-cache',
   ],
   install: true,
-  install_dir: get_option('datadir') / 'appdata',
+  install_dir: get_option('datadir') / 'metainfo',
 )
 
 if desktop_validate.found()
diff --git a/desktop/gimp-data-extras.metainfo.xml.in.in 
b/desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in
similarity index 93%
rename from desktop/gimp-data-extras.metainfo.xml.in.in
rename to desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in
index ec5427e2e1..1251987f0e 100644
--- a/desktop/gimp-data-extras.metainfo.xml.in.in
+++ b/desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Jiri Eischmann <eischmann redhat com> -->
 <component type="addon">
-  <id>gimp-data-extras</id>
+  <id>org.gimp.GIMP.data_extras</id>
   <extends>org.gimp.GIMP</extends>
   <_name>Extra files for GIMP</_name>
   <_summary>Patterns, gradients, and other extra files for GIMP</_summary>
diff --git a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in
index 45cf9af0c9..8fe3e80749 100755
--- a/desktop/test-appdata.sh.in
+++ b/desktop/test-appdata.sh.in
@@ -3,7 +3,7 @@
 # TODO: use validate-strict when the last errors for a strict validation
 # are fixed.
 appstreamcli validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
-appstreamcli validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
+appstreamcli validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.data_extras.metainfo.xml && \
 if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then
   grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml
   if [ $? = 0 ]; then
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fa73f471dc..29a46f96b1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@
 [encoding: UTF-8]
 
 desktop/org.gimp.GIMP.appdata.xml.in.in
-desktop/gimp-data-extras.metainfo.xml.in.in
+desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in
 desktop/gimp.desktop.in.in
 
 app/about.h
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1fd405bfbe..eaeaad5325 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -3,7 +3,7 @@ build/windows/installer/lang/setup.isl.in
 data/tags/gimp-tags-default.xml.in
 data/tips/gimp-tips.xml.in
 desktop/org.gimp.GIMP.appdata.xml.in
-desktop/gimp-data-extras.metainfo.xml.in
+desktop/org.gimp.GIMP.data_extras.metainfo.xml.in
 desktop/gimp.desktop.in
 extensions
 libgimp