From 5c772960bc5e450b009e08e21271052086030385 Mon Sep 17 00:00:00 2001
From: Ilyas Erdogan <ilyas.erdogan@savoirfairelinux.com>
Date: Fri, 11 Jul 2025 16:00:04 -0400
Subject: [PATCH] Adhere to flatpak/flathub requirements

- Developer id must be rDns identifier of developer
- Exported icons should match rDNS of app id
- Release version and dates should be included
- Added light and dark branding colours for Flathub banner
- Contact url removed - does not pass appstream validation

Change-Id: Ic5e2a5abeab4310ea87a34cc81363d1851135bcd
---
 CMakeLists.txt                                  |   4 ++--
 extras/data/jami.xml                            |   2 +-
 extras/data/net.jami.Jami.desktop               |   2 +-
 extras/data/net.jami.Jami.metainfo.xml          |  16 +++++++++++++---
 .../{jami-48px.png => net.jami.Jami-48px.png}   | Bin
 .../images/{jami.svg => net.jami.Jami.svg}      |   0
 6 files changed, 17 insertions(+), 7 deletions(-)
 rename resources/images/{jami-48px.png => net.jami.Jami-48px.png} (100%)
 rename resources/images/{jami.svg => net.jami.Jami.svg} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 710ac6dbc..175836443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,12 +847,12 @@ elseif (NOT APPLE)
 
   # Logos
   install(
-    FILES resources/images/jami.svg
+    FILES resources/images/net.jami.Jami.svg
     DESTINATION
     ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
 
   install(
-    FILES resources/images/jami-48px.png
+    FILES resources/images/net.jami.Jami-48px.png
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps
     RENAME jami.png)
 
diff --git a/extras/data/jami.xml b/extras/data/jami.xml
index 49ae6e797..bd374673e 100644
--- a/extras/data/jami.xml
+++ b/extras/data/jami.xml
@@ -85,7 +85,7 @@
       <id>net.jami.daemon</id>
     </requires>
     <launchable type="desktop-id">net.jami.Jami.desktop</launchable>
-    <icon type="stock">jami</icon>
+    <icon type="stock">net.jami.Jami</icon>
     <url type="homepage">https://jami.net/</url>
     <url type="bugtracker">https://git.jami.net/savoirfairelinux/jami-client-qt/issues</url>
     <url type="faq">https://docs.jami.net/user/faq.html</url>
diff --git a/extras/data/net.jami.Jami.desktop b/extras/data/net.jami.Jami.desktop
index 439397d54..3a5e89834 100644
--- a/extras/data/net.jami.Jami.desktop
+++ b/extras/data/net.jami.Jami.desktop
@@ -4,7 +4,7 @@ GenericName=Jami
 Comment=Share, freely and privately
 Comment[hu]=Megosztás, szabadon és bizalmasan
 Exec=jami %u
-Icon=jami
+Icon=net.jami.Jami
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/extras/data/net.jami.Jami.metainfo.xml b/extras/data/net.jami.Jami.metainfo.xml
index 89724d9e6..f40c26946 100644
--- a/extras/data/net.jami.Jami.metainfo.xml
+++ b/extras/data/net.jami.Jami.metainfo.xml
@@ -7,15 +7,26 @@
   <summary>Share, freely and privately</summary>
   <summary xml:lang="hu">Megosztás, szabadon és bizalmasan</summary>
 
-  <icon type="stock">jami</icon>
+  <icon type="stock">net.jami.Jami</icon>
 
   <metadata_license>CC-BY-SA-3.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
 
-  <developer id="net.jami.Jami">
+  <developer id="net.jami">
     <name>Savoir-faire Linux Inc.</name>
   </developer>
 
+  <releases>
+    <release version="20250613.0" date="2025-06-13">
+      <url type="details">https://git.jami.net/savoirfairelinux/jami-client-qt/-/wikis/Changelog#nightlystable-20250613</url>
+    </release>
+  </releases>
+
+  <branding>
+    <color type="primary" scheme_preference="light">#03b9e9</color>
+    <color type="primary" scheme_preference="dark">#005699</color>
+  </branding>
+
   <!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-description -->
   <description>
 
@@ -76,7 +87,6 @@
   <url type="bugtracker">https://git.jami.net/savoirfairelinux/jami-client-qt/issues</url>
   <url type="homepage">https://jami.net/</url>
   <url type="donation">https://jami.net/whydonate/</url>
-  <url type="contact">contact@jami.net</url>
   <url type="faq">https://docs.jami.net/user/faq.html</url>
   <url type="translate">https://explore.transifex.com/savoirfairelinux/jami/</url>
   <url type="contribute">https://jami.net/contribute/</url>
diff --git a/resources/images/jami-48px.png b/resources/images/net.jami.Jami-48px.png
similarity index 100%
rename from resources/images/jami-48px.png
rename to resources/images/net.jami.Jami-48px.png
diff --git a/resources/images/jami.svg b/resources/images/net.jami.Jami.svg
similarity index 100%
rename from resources/images/jami.svg
rename to resources/images/net.jami.Jami.svg