[Debian-astro-maintainers] Bug#1078195: aravis-tools: Correct appstream metainfo description and file name

[Petter Reinholdtsen]

Package: aravis-tools
Version: 0.8.26-1
Tags: patch
User: pere at hungry.com
Usertags: appstream-modalias

The appstream parser report several issues for aravis-tools:

  E: org.aravis.viewer:~: app-description-required
     The component is missing a long description. Components of this type must have a long
     description.

  W: org.aravis.viewer:~: metainfo-filename-cid-mismatch
     The metainfo filename does not match the component ID.

The following patch solve these, and should make the appstream
information appear in the published database.

diff --git a/debian/aravis-tools.install b/debian/aravis-tools.install
index 5c08735..2f93a08 100644
--- a/debian/aravis-tools.install
+++ b/debian/aravis-tools.install
@@ -7,5 +7,5 @@ usr/share/man/man1/arv-camera*
 usr/share/man/man1/arv-test*
 usr/share/icons/
 usr/share/locale/
-usr/share/metainfo/org.aravis.viewer-*.appdata.xml
+usr/share/metainfo/org.aravis.viewer.metainfo.xml
 usr/share/applications/org.aravis.viewer-*.desktop
diff --git a/debian/patches/1000-appstream-metainfo.patch b/debian/patches/1000-appstream-metainfo.patch
new file mode 100644
index 0000000..2c0f669
--- /dev/null
+++ b/debian/patches/1000-appstream-metainfo.patch
@@ -0,0 +1,34 @@
+Description: Corrected appstream metainfo validation errors.
+ Added missing <p> to description and make sure file name match ID.
+ Also use the new 'metainfo.xml' ending replacing the obsolete
+ 'appdata.xml' ending.
+Author: Petter Reinholdtsen
+Bug-Debian: https://bugs.debian.org/?
+Forwarded: no
+Last-Update: 2024-08-08
+---
+--- aravis-0.8.30.orig/viewer/data/meson.build
++++ aravis-0.8.30/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- at 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)
+ 
+--- aravis-0.8.30.orig/viewer/data/org.aravis.viewer.appdata.xml.in
++++ aravis-0.8.30/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">
diff --git a/debian/patches/series b/debian/patches/series
index fb088ba..8662a5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build_doc.diff
+1000-appstream-metainfo.patch

-- 
Happy hacking
Petter Reinholdtsen