[five-or-more] Switch to appstream util validate from appdata validation



commit 23acfbeb385fbe547748d32d37332985752af9f1
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Dec 15 21:21:25 2014 +0200

    Switch to appstream util validate from appdata validation

 .gitignore                       |   69 ++++++++++++++++++++++++++++++++++++++
 configure.ac                     |    3 +-
 data/Makefile.am                 |   13 +++----
 data/five-or-more.appdata.xml.in |    2 +
 4 files changed, 79 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b8a833d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+/*.bak
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.dirstamp
+/.gitignore
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/aclocal.m4
+/ar-lib
+/autom4te.cache
+/autoscan.log
+/compile
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.lt
+/config.status
+/config.status.lineno
+/config.sub
+/configure
+/configure.lineno
+/configure.scan
+/data/Makefile.in
+/data/icons/HighContrast/Makefile.in
+/data/icons/Makefile.in
+/data/icons/hicolor/Makefile.in
+/data/*.appdata.valid
+/depcomp
+/help/Makefile.in
+/install-sh
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/libtool
+/ltmain.sh
+/missing
+/mkinstalldirs
+/po/*.gmo
+/po/*.header
+/po/*.mo
+/po/*.sed
+/po/*.sin
+/po/.intltool-merge-cache
+/po/Makefile
+/po/Makefile.in
+/po/Makefile.in.in
+/po/Makefile.in.in~
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/five-or-more.pot
+/po/stamp-it
+/so_locations
+/src/Makefile.in
+/stamp-h1
+/tags
diff --git a/configure.ac b/configure.ac
index 6b1b094..8c1672e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
 
 GLIB_GSETTINGS
 
+APPSTREAM_XML
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
@@ -27,7 +29,6 @@ PKG_CHECK_MODULES(FIVE_OR_MORE, [
   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 4300278..caf95bc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,25 +23,24 @@ desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = five-or-more.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = five-or-more.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST =                   \
        $(theme_DATA)           \
-       $(appdata_in_files)     \
+       $(appstream_in_files)   \
        $(desktop_in_files)     \
        $(gsettings_SCHEMAS)    \
        $(man_MANS)     \
        $(ui_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)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/five-or-more.appdata.xml.in b/data/five-or-more.appdata.xml.in
index 463ed38..01563f5 100644
--- a/data/five-or-more.appdata.xml.in
+++ b/data/five-or-more.appdata.xml.in
@@ -4,6 +4,8 @@
  <id type="desktop">five-or-more.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
+ <_name>Five or More</_name>
+ <_summary>Remove colored balls from the board by forming lines</_summary>
  <description>
   <_p>
    Five or More is the GNOME port of a once-popular computer game. Align five or


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]