[swell-foop] Switch to appstream util validate from appdata validation



commit af779bb8c68ad520d87602a8fecc98a91ed3a549
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Dec 15 21:12:01 2014 +0200

    Switch to appstream util validate from appdata validation

 .gitignore                     |   69 ++++++++++++++++++++++++++++++++++++++++
 configure.ac                   |    3 +-
 data/Makefile.am               |   15 +++++----
 data/swell-foop.appdata.xml.in |    2 +
 4 files changed, 81 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9af3fde
--- /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.log
+/config.lt
+/config.status
+/config.status.lineno
+/config.sub
+/configure
+/configure.lineno
+/configure.scan
+/data/Makefile.in
+/data/icons/Makefile.in
+/data/themes/Makefile.in
+/data/themes/colors/Makefile.in
+/data/themes/shapesandcolors/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/stamp-it
+/po/swell-foop.pot
+/so_locations
+/src/Makefile.in
+/stamp-h1
+/tags
diff --git a/configure.ac b/configure.ac
index d742935..a570121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
 
 GLIB_GSETTINGS
 
+APPSTREAM_XML
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
@@ -30,7 +32,6 @@ PKG_CHECK_MODULES(SWELL_FOOP, [
 
 AC_CHECK_LIB([m],[floor])
 
-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 b547fe8..d744154 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,23 +13,24 @@ desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = swell-foop.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = swell-foop.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) \
     $(swell_DATA) \
     $(gsettings_SCHEMAS) \
     $(desktop_in_files)
 
 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/swell-foop.appdata.xml.in b/data/swell-foop.appdata.xml.in
index 4970586..654d032 100644
--- a/data/swell-foop.appdata.xml.in
+++ b/data/swell-foop.appdata.xml.in
@@ -4,6 +4,8 @@
  <id type="desktop">swell-foop.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+ and GFDL-1.1</project_license>
+ <_name>Swell Foop</_name>
+ <_summary>Clear the screen by removing groups of colored and shaped tiles</_summary>
  <description>
   <_p>
    Remove as many squares as possible from the board. Click on a group of


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