build: Misc cleanup

- Fix names of data files - Fix appdata missing tag - Remove bundled appstream-xml.m4 - Print useful error on missing appstream-glib
pithos · Jul 13, 2016 · 2512d30 · 2512d30
1 parent 540e9cf
commit 2512d30
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,8 +9,8 @@ configure
 config.*
 /autom4te.cache/
 aclocal.m4
-data/pithos.appdata.xml
-data/pithos.desktop
+data/io.github.Pithos.appdata.xml
+data/io.github.Pithos.desktop
 data/gschemas.compiled
 *.valid
 *.pot

diff --git a/configure.ac b/configure.ac
@@ -13,6 +13,7 @@ GETTEXT_PACKAGE=pithos
 AC_SUBST(GETTEXT_PACKAGE)
 
 m4_ifndef([GLIB_GSETTINGS], [AC_MSG_ERROR([gsettings.m4 not found])])
+m4_ifndef([APPSTREAM_XML], [AC_MSG_ERROR([appstream-xml.m4 not found])])
 
 IT_PROG_INTLTOOL([0.50.0])
 DESKTOP_FILE

diff --git a/data/io.github.Pithos.appdata.xml.in b/data/io.github.Pithos.appdata.xml.in
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
 	<id type="desktop">io.github.Pithos.desktop</id>
+	<translation type="gettext">pithos</translation>
 	<name>Pithos</name>
 	<summary>Pandora radio client</summary>
 	<metadata_license>CC0</metadata_license>

diff --git a/m4/appstream-xml.m4 b/m4/appstream-xml.m4
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,6 +1,6 @@
-data/pithos.appdata.xml.in
-data/pithos.desktop.in
-[type: gettext/gsettings]data/pithos.gschema.xml
+data/io.github.Pithos.appdata.xml.in
+data/io.github.Pithos.desktop.in
+[type: gettext/gsettings]data/io.github.Pithos.gschema.xml
 [type: gettext/glade]data/ui/AboutPithosDialog.ui
 [type: gettext/glade]data/ui/PithosWindow.ui
 [type: gettext/glade]data/ui/PreferencesPithosDialog.ui