From 04bdcfb906e4f9fb2fc4b1658360121078332769 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sun, 31 Mar 2024 22:46:35 +0200
Subject: [PATCH 1/2] metainfo: Add app branding

---
 data/de.haeckerfelix.Shortwave.metainfo.xml.in.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in b/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
index 17b4c7f9..6f389f9c 100644
--- a/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
+++ b/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
@@ -69,6 +69,12 @@
     <control>touch</control>
   </recommends>
 
+  <branding>
+    <!-- Yellow 4 and Brown 4 -->
+    <color type="primary" scheme_preference="light">#f5c211</color>
+    <color type="primary" scheme_preference="dark">#865e3c</color>
+  </branding>
+
   <releases>
     <release version="3.2.0" date="2023-02-07">
       <description>
-- 
GitLab


From 16d305851ab18e6b4d897b36ab263909bb0f4c1c Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sun, 31 Mar 2024 23:16:04 +0200
Subject: [PATCH 2/2] metainfo: Restructure and add a more detailed description

- Remove update_contact
- Remove kudos
- Remove translatable=no from name
---
 ....haeckerfelix.Shortwave.metainfo.xml.in.in | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in b/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
index 6f389f9c..99f41103 100644
--- a/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
+++ b/data/de.haeckerfelix.Shortwave.metainfo.xml.in.in
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020-2023 Felix Häcker -->
 <component type="desktop-application">
+  <!-- Meson Build -->
   <id>@APP_ID@</id>
   <name>@NAME@</name>
-  <summary>Listen to internet radio</summary>
   <translation type="gettext">@PKGNAME@</translation>
-  <!-- developer_name tag deprecated with Appstream 1.0 -->
-  <developer_name translatable="no">Felix Häcker</developer_name>
-  <developer id="de.haeckerfelix">
-    <name translatable="no">Felix Häcker</name>
-  </developer>
-  <update_contact>haeckerfelix@gnome.org</update_contact>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
   <launchable type="desktop-id">@APP_ID@.desktop</launchable>
-  <content_rating type="oars-1.1"/>
 
+  <!-- General -->
+  <summary>Listen to internet radio</summary>
   <description>
     <p>
       Shortwave is an internet radio player that provides access to a station database with over 30,000 stations.
@@ -30,51 +22,56 @@
       <li>Seamless integration into the GNOME desktop environment</li>
     </ul>
   </description>
+  <content_rating type="oars-1.1"/>
 
-  <screenshots>
-    <screenshot type="default" height="1072" width="772">
-      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/1.png</image>
-    </screenshot>
-    <screenshot height="1072" width="772">
-      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/2.png</image>
-    </screenshot>
-    <screenshot height="1072" width="772">
-      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/3.png</image>
-    </screenshot>
-  </screenshots>
+  <!-- Branding -->
+  <developer_name>Felix Häcker</developer_name>
+  <developer id="de.haeckerfelix">
+    <name>Felix Häcker</name>
+  </developer>
+  <branding>
+    <!-- Yellow 4 and Brown 4 -->
+    <color type="primary" scheme_preference="light">#f5c211</color>
+    <color type="primary" scheme_preference="dark">#865e3c</color>
+  </branding>
+
+  <!-- License -->
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
 
+  <!-- URLs -->
   <url type="homepage">https://gitlab.gnome.org/World/Shortwave</url>
   <url type="bugtracker">https://gitlab.gnome.org/World/Shortwave/issues</url>
   <url type="donation">https://liberapay.com/haecker-felix</url>
   <url type="translate">https://l10n.gnome.org/module/Shortwave/</url>
+  <url type="contact">https://matrix.to/#/#shortwave:gnome.org</url>
   <url type="vcs-browser">https://gitlab.gnome.org/World/Shortwave</url>
+  <url type="contribute">https://welcome.gnome.org/app/Shortwave/</url>
 
-  <kudos>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-    <kudo>Notifications</kudo>
-  </kudos>
-
-  <custom>
-    <value key="Purism::form_factor">mobile</value>
-  </custom>
-
+  <!-- Supported Hardware -->
   <requires>
     <display_length compare="ge">360</display_length>
   </requires>
-
   <recommends>
     <control>keyboard</control>
     <control>pointing</control>
     <control>touch</control>
   </recommends>
 
-  <branding>
-    <!-- Yellow 4 and Brown 4 -->
-    <color type="primary" scheme_preference="light">#f5c211</color>
-    <color type="primary" scheme_preference="dark">#865e3c</color>
-  </branding>
+  <!-- Screenshots -->
+  <screenshots>
+    <screenshot type="default">
+      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/2.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://gitlab.gnome.org/World/Shortwave/raw/main/data/screenshots/3.png</image>
+    </screenshot>
+  </screenshots>
 
+  <!-- Releases -->
   <releases>
     <release version="3.2.0" date="2023-02-07">
       <description>
-- 
GitLab