From 21dc00048487304abeb576a9de72ee70dc3e901f Mon Sep 17 00:00:00 2001
From: Chiara Marmo <marmochiaskl@gmail.com>
Date: Tue, 3 Sep 2024 10:34:12 +0200
Subject: [PATCH 1/3] aravis-tools: Correct appstream metainfo description and
 file name

Co-authored-by: Petter Reinholdtsen <pere@hungry.com>
---
 viewer/data/meson.build                      | 2 +-
 viewer/data/org.aravis.viewer.appdata.xml.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/viewer/data/meson.build b/viewer/data/meson.build
index d4b46ad8b..3df8442ba 100644
--- a/viewer/data/meson.build
+++ b/viewer/data/meson.build
@@ -4,7 +4,7 @@ appdata_conf = configuration_data()
 appdata_conf.set ('ARAVIS_API_VERSION', aravis_api_version)
 
 configure_file (input: files('org.aravis.viewer.appdata.xml.in'),
-		output: 'org.aravis.viewer-@0@.appdata.xml'.format (aravis_api_version),
+		output: 'org.aravis.viewer.metainfo.xml'.format (aravis_api_version),
 		configuration: appdata_conf,
 		install_dir: aravis_app_data_dir)
 
diff --git a/viewer/data/org.aravis.viewer.appdata.xml.in b/viewer/data/org.aravis.viewer.appdata.xml.in
index 3cf0c444b..1f8ef25aa 100644
--- a/viewer/data/org.aravis.viewer.appdata.xml.in
+++ b/viewer/data/org.aravis.viewer.appdata.xml.in
@@ -7,9 +7,9 @@
   <name>Aravis Viewer</name>
   <summary>Viewer for industial camera video stream</summary>
   <description>
-    Aravis Viewer is a simple viewer displaying video streams from USB3 and ethernet industrial cameras supporting the
+    <p>Aravis Viewer is a simple viewer displaying video streams from USB3 and ethernet industrial cameras supporting the
     GENICAM specification. It allows to control basic acquisition parameters (like framerate, exposure and gain), and to
-    save raw still images.
+    save raw still images.</p>
   </description>
   <screenshots>
     <screenshot type="default">

From 47d1d01d23aabc982a4ee25d8dab539d734324b6 Mon Sep 17 00:00:00 2001
From: Chiara Marmo <marmochiaskl@gmail.com>
Date: Tue, 3 Sep 2024 17:30:57 +0200
Subject: [PATCH 2/3] Include the API version in the appdata filename

---
 viewer/data/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/data/meson.build b/viewer/data/meson.build
index 3df8442ba..5a5b2797f 100644
--- a/viewer/data/meson.build
+++ b/viewer/data/meson.build
@@ -4,7 +4,7 @@ appdata_conf = configuration_data()
 appdata_conf.set ('ARAVIS_API_VERSION', aravis_api_version)
 
 configure_file (input: files('org.aravis.viewer.appdata.xml.in'),
-		output: 'org.aravis.viewer.metainfo.xml'.format (aravis_api_version),
+		output: 'org.aravis.viewer-@0@.metainfo.xml'.format (aravis_api_version),
 		configuration: appdata_conf,
 		install_dir: aravis_app_data_dir)
 

From fbc8e7f05f5eac42cc730046d096567f91ded629 Mon Sep 17 00:00:00 2001
From: Chiara Marmo <marmochiaskl@gmail.com>
Date: Tue, 3 Sep 2024 17:47:59 +0200
Subject: [PATCH 3/3] Fix component id in metadat info file.

---
 viewer/data/org.aravis.viewer.appdata.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/data/org.aravis.viewer.appdata.xml.in b/viewer/data/org.aravis.viewer.appdata.xml.in
index 1f8ef25aa..4141adb31 100644
--- a/viewer/data/org.aravis.viewer.appdata.xml.in
+++ b/viewer/data/org.aravis.viewer.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014-2023 Emmanuel Pacaud <emmanuel.pacaud@free.fr> -->
 <component type="desktop-application">
-  <id>org.aravis.viewer</id>
+  <id>org.aravis.viewer-@ARAVIS_API_VERSION@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0-or-later</project_license>
   <name>Aravis Viewer</name>