solenv/bin/assemble-flatpak-appdata.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4b62a0e8e065ea1d9a7f0a3a6798aaaafc681ce9
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Apr 2 10:12:51 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Apr 3 10:11:01 2025 +0200
Fill in the flatpak appdata screenshot captions
...that had been left empty when they had been introduced in
<https://git.libreoffice.org/dev-tools/+/f96d7afbf282e5621697aca84177e42fe2cc2255%5E!>
"Adapt org.libreoffice.LibreOffice.appdata.xml". (This should avoid the
warning
"appstream-screenshot-missing-caption: One or more screenshots are missing
captions in the Metainfo file" from `flatpak run
--command=flatpak-builder-lint
org.flatpak.Builder repo repo`, see
<https://docs.flathub.org/docs/for-app-authors/submission#run-the-linter>.)
Change-Id: Ib1f3a629cbb19229408f8d476a37385678a607d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183634
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit ff3c48c213332e2bb617de4cda6ebc4994906f92)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183639
Tested-by: allotropia jenkins <jenk...@allotropia.de>
diff --git a/solenv/bin/assemble-flatpak-appdata.sh
b/solenv/bin/assemble-flatpak-appdata.sh
index 3c6d98246632..a4768ac4c536 100755
--- a/solenv/bin/assemble-flatpak-appdata.sh
+++ b/solenv/bin/assemble-flatpak-appdata.sh
@@ -51,23 +51,23 @@ cat <<\EOF >"${1?}"de.allotropia.ZetaOffice.appdata.xml
<screenshots>
<screenshot type="default">
<image>https://hub.libreoffice.org/screenshots/writer-01.png</image>
- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+ <caption>Sample Writer document</caption>
</screenshot>
<screenshot>
<image>https://hub.libreoffice.org/screenshots/calc-02.png</image>
- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+ <caption>Sample Calc document</caption>
</screenshot>
<screenshot>
<image>https://hub.libreoffice.org/screenshots/impress-01.png</image>
- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+ <caption>Sample Impress document</caption>
</screenshot>
<screenshot>
<image>https://hub.libreoffice.org/screenshots/draw-02.png</image>
- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+ <caption>Sample Draw document</caption>
</screenshot>
<screenshot>
<image>https://hub.libreoffice.org/screenshots/base-02.png</image>
- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+ <caption>Sample Base document</caption>
</screenshot>
</screenshots>
<developer_name>The Document Foundation</developer_name>
commit a17b56543f4f857fe63486beabd22a8746bd6ab7
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Apr 2 10:17:33 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Apr 3 10:10:47 2025 +0200
Drop .desktop suffix from flatpak appdata id
...that had been like that (for reasons that escape me now) ever since
<https://git.libreoffice.org/dev-tools/+/cb6ca493be62b59aa16c7ec6a051e594a1d92f18%5E!>
"Create a single-app LibreOffice.flatpak", but which causes an error
"appstream-id-mismatch-flatpak-id: The ID tag:
org.libreoffice.LibreOffice.desktop in Metainfo does not match the
FLATPAK_ID:
org.libreoffice.LibreOffice" from `flatpak run
--command=flatpak-builder-lint
org.flatpak.Builder repo repo` (see
<https://docs.flathub.org/docs/for-app-authors/submission#run-the-linter>)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit c36f2356511d36c3d5c8cf6ffbdad308c9c4120b)
Conflicts:
solenv/bin/assemble-flatpak-appdata.sh
Change-Id: I0823020e6de20930b1ef8d5205fcf49ac2319a92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183641
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/bin/assemble-flatpak-appdata.sh
b/solenv/bin/assemble-flatpak-appdata.sh
index f6f10404b4c8..3c6d98246632 100755
--- a/solenv/bin/assemble-flatpak-appdata.sh
+++ b/solenv/bin/assemble-flatpak-appdata.sh
@@ -25,7 +25,7 @@ set -e
cat <<\EOF >"${1?}"de.allotropia.ZetaOffice.appdata.xml
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
- <id>de.allotropia.ZetaOffice.desktop</id>
+ <id>de.allotropia.ZetaOffice</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>ZetaOffice</name>
