...
 
Commits (4)
......@@ -16,8 +16,11 @@ ibus-cangjie (2.4-2) unstable; urgency=medium
* debian/patches:
+ Refresh existing patches.
+ Cherry-pick patch from upstream trunk to properly import gi modules.
+ Add a patch to fix lintian error on appdata.
* debian/copyright:
+ Fix insecure uri for Format field and update link to upstream project.
-- Boyuan Yang <byang@debian.org> Sat, 10 Nov 2018 18:08:48 -0500
-- Boyuan Yang <byang@debian.org> Mon, 12 Nov 2018 20:34:50 -0500
ibus-cangjie (2.4-1) unstable; urgency=medium
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ibus-cangjie
Source: https://github.com/bochecha/ibus-cangjie
Source: https://github.com/Cangjians/ibus-cangjie
Files: *
Copyright: 2012-2014 Benau <benau2006@yahoo.com.hk>
......
From: Boyuan Yang <byang@debian.org>
Date: Mon, 12 Nov 2018 20:11:18 -0500
Subject: data: Use new appdata location and format
Forwarded: https://github.com/Cangjians/ibus-cangjie/issues/91
This fixes lintian errors.
---
Makefile.am | 2 +-
data/cangjie.appdata.xml.in | 12 ++++++------
data/quick.appdata.xml.in | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1142421..0213515 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ ibus_cangjie_datadir = $(pkgdatadir)
@INTLTOOL_XML_RULE@
appdata_in_files = data/cangjie.appdata.xml.in data/quick.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
component_in_in_files = data/cangjie.xml.in.in data/quick.xml.in.in
component_DATA = $(component_in_in_files:.xml.in.in=.xml)
diff --git a/data/cangjie.appdata.xml.in b/data/cangjie.appdata.xml.in
index 63fba3c..7e9b3f9 100644
--- a/data/cangjie.appdata.xml.in
+++ b/data/cangjie.appdata.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="inputmethod">cangjie.xml</id>
- <licence>CC0</licence>
+<component type="inputmethod">
+ <id>com.github.cangjians.ibus-cangjie</id>
+ <metadata_license>CC0-1.0</metadata_license>
<_name>Cangjie</_name>
<_summary>Cangjie input method</_summary>
<description>
@@ -12,6 +12,6 @@
experience for people of the SAR by default, but provide useful options
for others.</_p>
</description>
- <url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
- <updatecontact>hklug@googlegroups.com</updatecontact>
-</application>
+ <url type="homepage">https://github.com/Cangjians/ibus-cangjie/</url>
+ <update_contact>hklug@googlegroups.com</update_contact>
+</component>
diff --git a/data/quick.appdata.xml.in b/data/quick.appdata.xml.in
index a34655e..80be739 100644
--- a/data/quick.appdata.xml.in
+++ b/data/quick.appdata.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="inputmethod">quick.xml</id>
- <licence>CC0</licence>
+<component type="inputmethod">
+ <id>com.github.cangjians.ibus-cangjie.quick</id>
+ <metadata_license>CC0-1.0</metadata_license>
<_name>Quick</_name>
<_summary>Quick input method</_summary>
<description>
@@ -14,5 +14,5 @@
for others.</_p>
</description>
<url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
- <updatecontact>hklug@googlegroups.com</updatecontact>
-</application>
+ <update_contact>hklug@googlegroups.com</update_contact>
+</component>
0001-install-engine-to-correct-dir.diff
0002-Properly-import-gi-modules-to-avoid-PyGIWarning.patch
0003-data-Use-new-appdata-location-and-format.patch
......@@ -24,4 +24,3 @@ override_dh_auto_test:
override_dh_missing:
dh_missing --fail-missing