[neon/extras/kxstitch/Neon/release] debian: fix appstream file

[Pino Toscano]

Git commit 5d850559b551641a89322a1d578b3be5f6fbccdf by Pino Toscano.
Committed on 25/02/2021 at 06:25.
Pushed by jriddell into branch 'Neon/release'.

fix appstream file

backport upstream commits 19b641c68c8a9ce11fdabb86f3cec6ddec59dfbc
and 11f715597e64e6901428de81f7fa1944026c8eca

M  +5    -0    debian/changelog
A  +2    -0    debian/patches/series
A  +36   -0    debian/patches/upstream_Improve-appdata.patch
A  +55   -0    debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch

https://invent.kde.org/neon/extras/kxstitch/commit/5d850559b551641a89322a1d578b3be5f6fbccdf

diff --git a/debian/changelog b/debian/changelog
index 0418d0d..49796eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kxstitch (2.2.0-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commits 19b641c68c8a9ce11fdabb86f3cec6ddec59dfbc, and
+    11f715597e64e6901428de81f7fa1944026c8eca to fix the AppStream metadata;
+    patches upstream_Improve-appdata.patch, and
+    upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2021 07:23:00 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5d3689b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_Improve-appdata.patch
+upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
diff --git a/debian/patches/upstream_Improve-appdata.patch b/debian/patches/upstream_Improve-appdata.patch
new file mode 100644
index 0000000..81340da
--- /dev/null
+++ b/debian/patches/upstream_Improve-appdata.patch
@@ -0,0 +1,36 @@
+From 19b641c68c8a9ce11fdabb86f3cec6ddec59dfbc Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Fri, 3 Jul 2020 07:02:55 +0200
+Subject: [PATCH] Improve appdata
+
+- remove ".desktop" suffix from <id>, as it is not needed (it is
+  already type="desktop")
+- use canonical docs.kde.org help location
+---
+ org.kde.kxstitch.appdata.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/org.kde.kxstitch.appdata.xml b/org.kde.kxstitch.appdata.xml
+index 5b5b53d..339a87c 100644
+--- a/org.kde.kxstitch.appdata.xml
++++ b/org.kde.kxstitch.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <component type="desktop">
+-  <id>org.kde.kxstitch.desktop</id>
++  <id>org.kde.kxstitch</id>
+   <metadata_license>GFDL-1.2-without-invariant</metadata_license>
+   <name>KXStitch</name>
+   <name xml:lang="ast">KXStitch</name>
+@@ -306,7 +306,7 @@
+   </description>
+   <url type="homepage">https://userbase.kde.org/Special:myLanguage/KXStitch</url>
+   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kxstitch</url>
+-  <url type="help">http://docs.kde.org/development/en/extragear-graphics/kxstitch/index.html</url>
++  <url type="help">https://docs.kde.org/?application=kxstitch</url>
+   <screenshots>
+     <screenshot type="default">
+       <image>https://cdn.kde.org/screenshots/kxstitch/Importedimage.png</image>
+-- 
+2.30.0
+
diff --git a/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch b/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
new file mode 100644
index 0000000..8287e61
--- /dev/null
+++ b/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
@@ -0,0 +1,55 @@
+From 11f715597e64e6901428de81f7fa1944026c8eca Mon Sep 17 00:00:00 2001
+From: Nick Richards <nick at nedrichards.com>
+Date: Mon, 13 Apr 2020 08:56:51 +0100
+Subject: [PATCH] Update kxstitch appdata to pass flathub validation
+
+Summary:
+The latest kxstitch release couldn't be distributed on flathub because it didn't pass the appstream validator. This diff fixes those errors:
+* choose a valid SPDX licence from https://spdx.org/licenses/
+* add an OARS tag https://hughsie.github.io/oars/
+* add release tags
+
+Test Plan:
+flatpak install flathub org.freedesktop.appstream-glib
+flatpak run org.freedesktop.appstream-glib validate org.kde.kxstitch.appdata.xml
+
+Reviewers: yurchor, sallewell
+
+Reviewed By: yurchor
+
+Tags: #flatpak
+
+Differential Revision: https://phabricator.kde.org/D28772
+
+(cherry picked from commit 48677343b338e4e90ea404a1882c810221f8a680)
+---
+ org.kde.kxstitch.appdata.xml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/org.kde.kxstitch.appdata.xml b/org.kde.kxstitch.appdata.xml
+index 339a87c..133d733 100644
+--- a/org.kde.kxstitch.appdata.xml
++++ b/org.kde.kxstitch.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <component type="desktop">
+   <id>org.kde.kxstitch</id>
+-  <metadata_license>GFDL-1.2-without-invariant</metadata_license>
++  <metadata_license>GFDL-1.2-only</metadata_license>
+   <name>KXStitch</name>
+   <name xml:lang="ast">KXStitch</name>
+   <name xml:lang="ca">KXStitch</name>
+@@ -304,6 +304,10 @@
+       <li xml:lang="zh-CN">打印图案和线键</li>
+     </ul>
+   </description>
++  <releases>
++    <release date="2019-06-07" version="2.2.0"/>
++  </releases>
++  <content_rating type="oars-1.1" />
+   <url type="homepage">https://userbase.kde.org/Special:myLanguage/KXStitch</url>
+   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kxstitch</url>
+   <url type="help">https://docs.kde.org/?application=kxstitch</url>
+-- 
+2.30.0
+