Commit da3a03f8 authored by Jeremy Bicha's avatar Jeremy Bicha

Adjust the AppStream metadata file so that it works with GNOME Software

parent 26d8b21a
......@@ -2,6 +2,8 @@ gucharmap (1:10.0.4-1) UNRELEASED; urgency=medium
* New upstream release
* Update Vcs fields for migration to https://salsa.debian.org/
* Add fix-invalid-AppStream-metadata.patch:
- Adjust the AppStream metadata file so that it works with GNOME Software
-- Jeremy Bicha <jbicha@debian.org> Fri, 19 Jan 2018 22:14:14 -0500
......
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Fri, 16 Mar 2018 17:56:09 -0400
Subject: fix invalid AppStream metadata
AppStream tools don't handle that syntax yet
so let's simplify it
https://github.com/hughsie/appstream-glib/issues/225
https://github.com/hughsie/appstream-glib/issues/226
https://github.com/ximion/appstream/issues/181
---
data/gucharmap.appdata.xml.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/gucharmap.appdata.xml.in b/data/gucharmap.appdata.xml.in
index 255c3ac..b033802 100644
--- a/data/gucharmap.appdata.xml.in
+++ b/data/gucharmap.appdata.xml.in
@@ -32,7 +32,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:its="http://www.w3.org/2005/11/its">
<id>gucharmap.desktop</id>
- <metadata_license>GPL-3.0+ or GFDL-1.3-only</metadata_license>
+ <metadata_license>GFDL-1.3</metadata_license>
+ <!--Metadata is also licensed as GPL-3.0+-->
<project_license>GPL-3.0+</project_license>
<_name>Character Map</_name>
<_summary>Insert special characters into documents</_summary>
unicode-source-generation.patch
fix-invalid-AppStream-metadata.patch
Description: compatibility with the unicode-data package
Adjust the script used for unicode header file generation for compatibility
with the Debian unicode-data package.
Author: Steve Langasek <vorlon@debian.org>
Bug-Debian: http://bugs.debian.org/603405
Index: gucharmap-10.0.3/gucharmap/gen-guch-unicode-tables.pl
===================================================================
--- gucharmap-10.0.3.orig/gucharmap/gen-guch-unicode-tables.pl 2017-11-01 00:59:03.441128398 +0100
+++ gucharmap-10.0.3/gucharmap/gen-guch-unicode-tables.pl 2017-11-01 00:59:03.441128398 +0100
From: Steve Langasek <vorlon@debian.org>
Date: Sun, 17 Jun 2012 14:28:42 +0000
Subject: compatibility with the unicode-data package
Adjust the script used for unicode header file generation
for compatibility with the Debian unicode-data package.
Bug-Debian: https://bugs.debian.org/603405
---
gucharmap/gen-guch-unicode-tables.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gucharmap/gen-guch-unicode-tables.pl b/gucharmap/gen-guch-unicode-tables.pl
index ae7728c..5c662ee 100755
--- a/gucharmap/gen-guch-unicode-tables.pl
+++ b/gucharmap/gen-guch-unicode-tables.pl
@@ -12,7 +12,7 @@
# - unicode-versions.h
#
......@@ -16,7 +23,7 @@ Index: gucharmap-10.0.3/gucharmap/gen-guch-unicode-tables.pl
#
# NOTE! Some code copied from glib/glib/gen-unicode-tables.pl; keep in sync!
@@ -32,7 +32,7 @@
@@ -32,7 +32,7 @@ if (@ARGV != 2 && @ARGV != 3)
Usage: $0 UNICODE-VERSION DIRECTORY [--i18n]
DIRECTORY should contain the following Unicode data files:
......@@ -25,7 +32,7 @@ Index: gucharmap-10.0.3/gucharmap/gen-guch-unicode-tables.pl
which can be found at https://www.unicode.org/Public/UNIDATA/
@@ -54,7 +54,7 @@
@@ -54,7 +54,7 @@ opendir (my $dir, $d) or die "Cannot open Unicode data dir $d: $!\n";
for my $f (readdir ($dir))
{
$unicodedata_txt = "$d/$f" if ($f =~ /UnicodeData.*\.txt/);
......@@ -34,7 +41,7 @@ Index: gucharmap-10.0.3/gucharmap/gen-guch-unicode-tables.pl
$nameslist_txt = "$d/$f" if ($f =~ /NamesList.*\.txt/);
$blocks_txt = "$d/$f" if ($f =~ /Blocks.*\.txt/);
$scripts_txt = "$d/$f" if ($f =~ /Scripts.*\.txt/);
@@ -62,7 +62,7 @@
@@ -62,7 +62,7 @@ for my $f (readdir ($dir))
}
defined $unicodedata_txt or die "Did not find $d/UnicodeData.txt";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment