FIX(client): Improve appstream metadata

This changes the appstream id to info.mumble.Mumble, which is correct in regards to the specification.

Fixes #5441

4 files changed, 43 insertions, 33 deletions

diff --git a/scripts/info.mumble.Mumble.appdata.xml.in b/scripts/info.mumble.Mumble.appdata.xml.in
new file mode 100644
index 000000000..595ed4837
--- /dev/null
+++ b/scripts/info.mumble.Mumble.appdata.xml.in
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019-2022 The Mumble Developers -->
+<component type="desktop-application">
+	<id>info.mumble.Mumble</id>
+	<name>Mumble</name>
+	<summary>Low latency encrypted VoIP client</summary>
+	<project_license>BSD-3-Clause</project_license>
+	<metadata_license>CC0-1.0</metadata_license>
+	<developer_name>The Mumble Dev-Team</developer_name>
+	<description>
+		<p>Mumble is an open source, low-latency, high quality voice chat software.</p>
+	</description>
+	<content_rating type="oars-1.0">
+		<content_attribute id="social-chat">intense</content_attribute>
+		<content_attribute id="social-audio">intense</content_attribute>
+	</content_rating>
+	<url type="homepage">https://www.mumble.info/</url>
+	<url type="bugtracker">https://github.com/mumble-voip/mumble/issues</url>
+	<url type="help">https://wiki.mumble.info/wiki/Main_Page</url>
+	<url type="translate">https://wiki.mumble.info/wiki/Language_Translation</url>
+	<launchable type="desktop-id">info.mumble.Mumble.desktop</launchable>
+	<screenshots>
+		<screenshot type="default">
+			<caption>Light Theme</caption>
+			<image>https://www.mumble.info/blog/mumble-1.3.0-release-announcement/theme-lite.png</image>
+		</screenshot>
+		<screenshot>
+			<caption>Dark Theme</caption>
+			<image>https://www.mumble.info/blog/mumble-1.3.0-release-announcement/theme-dark.png</image>
+		</screenshot>
+	</screenshots>
+
+	<releases>
+		<release type="stable" version="@CMAKE_PROJECT_VERSION@"/>
+	</releases>
+	<provides>
+		<binary>mumble</binary>
+	</provides>
+</component>
diff --git a/scripts/org.mumble_voip.mumble.desktop b/scripts/info.mumble.Mumble.desktop
index bfb06ff2c..bfb06ff2c 100644
--- a/scripts/org.mumble_voip.mumble.desktop
+++ b/scripts/info.mumble.Mumble.desktop
diff --git a/scripts/org.mumble_voip.mumble.appdata.xml b/scripts/org.mumble_voip.mumble.appdata.xml
deleted file mode 100644
index 695992bff..000000000
--- a/scripts/org.mumble_voip.mumble.appdata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-	<id>org.mumble_voip.mumble</id>
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>BSD-3-Clause</project_license>
-	<name>Mumble</name>
-	<summary>Voice Chat Software</summary>
-
-	<description>
-		<p>
-				Mumble is an open source, low-latency, high quality voice chat software.
-		</p>
-	</description>
-	
-	<launchable type="desktop-id">org.mumble_voip.mumble.desktop</launchable>
-
-	<screenshots>
-		<screenshot type="default">
-			<caption>Light Theme</caption>
-			<image>https://www.mumble.info/blog/mumble-1.3.0-release-announcement/theme-lite.png</image>
-		</screenshot>
-		<screenshot>
-			<caption>Dark Theme</caption>
-			<image>https://www.mumble.info/blog/mumble-1.3.0-release-announcement/theme-dark.png</image>
-		</screenshot>
-	</screenshots>
-
-	<url type="homepage">https://mumble.info</url>
-
-	<developer_name>The Mumble Dev-Team</developer_name>
-</component>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3d5dc7e05..e8f343866 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -179,9 +179,11 @@ target_link_libraries(shared PUBLIC Tracy::TracyClient)
 if(client)
 	add_subdirectory(mumble)
 
+	configure_file("${CMAKE_SOURCE_DIR}/scripts/info.mumble.Mumble.appdata.xml.in" "${CMAKE_BINARY_DIR}/info.mumble.Mumble.appdata.xml")
+
 	if(UNIX AND NOT APPLE)
-		install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
-		install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+		install(FILES "${CMAKE_BINARY_DIR}/info.mumble.Mumble.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+		install(FILES "${CMAKE_SOURCE_DIR}/scripts/info.mumble.Mumble.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
 		install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps")
 		install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble_256x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "mumble.png")
 	endif()