From 611b121b3d3c09d0c16bf87174dc5ad0756f7158 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Sat, 18 Nov 2023 13:10:38 +0100
Subject: [PATCH] Drop .GUI from metainfo.xml file

This file is mostly used by packaging tools, such as flatpak, to get
info about the application. Since flatpak uses org.gnome.Hamster as the
main package id, the metainfo.xml must be named the same for it to be
used.

Possibly more things need to be renamed for all application ids to be
consistent, but it is non-obvious what the best approach is there (see
also #725 for details). For now, this pragmatically renames metainfo.xml
to ensure it is found by flatpak.
---
 ....Hamster.GUI.metainfo.xml => org.gnome.Hamster.metainfo.xml} | 2 +-
 data/wscript                                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename data/{org.gnome.Hamster.GUI.metainfo.xml => org.gnome.Hamster.metainfo.xml} (98%)

diff --git a/data/org.gnome.Hamster.GUI.metainfo.xml b/data/org.gnome.Hamster.metainfo.xml
similarity index 98%
rename from data/org.gnome.Hamster.GUI.metainfo.xml
rename to data/org.gnome.Hamster.metainfo.xml
index 9e19087b5..2d6747094 100644
--- a/data/org.gnome.Hamster.GUI.metainfo.xml
+++ b/data/org.gnome.Hamster.metainfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.gnome.Hamster.GUI</id>
+  <id>org.gnome.Hamster</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
   <name>Hamster</name>
diff --git a/data/wscript b/data/wscript
index db9ac210a..90b9c87de 100644
--- a/data/wscript
+++ b/data/wscript
@@ -15,7 +15,7 @@ def build(ctx):
         ctx(features='glib2',
             settings_schema_files=['org.gnome.hamster.gschema.xml'])
 
-    ctx.install_files('${DATADIR}/metainfo', 'org.gnome.Hamster.GUI.metainfo.xml')
+    ctx.install_files('${DATADIR}/metainfo', 'org.gnome.Hamster.metainfo.xml')
 
     filename = "org.gnome.Hamster.GUI.desktop"
     ctx(features = "subst",