[gnome-klotski] Switch from appdata-tools to appstream-util
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-klotski] Switch from appdata-tools to appstream-util
- Date: Tue, 25 Nov 2014 00:59:11 +0000 (UTC)
commit b8858e641b427831160997c65ea1a0684d4eb0e0
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Nov 24 18:55:26 2014 -0600
Switch from appdata-tools to appstream-util
configure.ac | 3 ++-
data/Makefile.am | 15 ++++++++-------
data/gnome-klotski.appdata.xml.in | 1 +
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a1cb41f..3868f6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
GLIB_GSETTINGS
+APPSTREAM_XML
+
dnl ###########################################################################
dnl Dependencies
dnl ###########################################################################
@@ -25,7 +27,6 @@ PKG_CHECK_MODULES(GNOME_KLOTSKI, [
librsvg-2.0 >= $RSVG_REQUIRED
])
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index ac594ae..d6c9ef4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,24 +14,25 @@ desktop_in_files = gnome-klotski.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-appdatadir = $(datadir)/appdata
-appdata_in_files = gnome-klotski.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = gnome-klotski.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
- $(appdata_in_files) \
+ $(appstream_in_files) \
$(gsettings_SCHEMAS) \
$(desktop_in_files) \
$(man_MANS) \
$(pixmap_DATA)
CLEANFILES = \
- $(appdata_DATA) \
+ $(appstream_XML) \
$(desktop_DATA)
-check-local: $(appdata_DATA) $(desktop_DATA)
- $(APPDATA_VALIDATE) $(appdata_DATA)
+check-local: $(desktop_DATA)
$(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
+DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-check
+
-include $(top_srcdir)/git.mk
diff --git a/data/gnome-klotski.appdata.xml.in b/data/gnome-klotski.appdata.xml.in
index d507f93..96c3525 100644
--- a/data/gnome-klotski.appdata.xml.in
+++ b/data/gnome-klotski.appdata.xml.in
@@ -5,6 +5,7 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+ and GFDL-1.1</project_license>
<_name>GNOME Klotski</_name>
+ <_summary>Slide blocks to solve the puzzle</_summary>
<description>
<_p>
GNOME Klotski is a set of block sliding puzzles. The objective is to move the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]