[baobab] Fix extraction of appdata translations

[Stefano Facchini <sfacchini src gnome org>]

commit fe2401f01cbc1c8e98b66ce5ecab984a68e2e873
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Tue Aug 9 09:29:38 2016 +0200

    Fix extraction of appdata translations
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769646

 configure.ac                         |   13 ++++++-------
 data/Makefile.am                     |   12 ++++++------
 data/org.gnome.baobab.appdata.xml.in |    6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 580db40..ed82ee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,13 +14,6 @@ AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability foreign])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
-
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -38,6 +31,12 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 # Mallard help
 YELP_HELP_INIT
 
+APPSTREAM_XML
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AC_SUBST([GETTEXT_PACKAGE], [baobab])
+
 PKG_CHECK_MODULES(BAOBAB, [
     gtk+-3.0 >= 3.19.1
     glib-2.0 >= 2.39.90
diff --git a/data/Makefile.am b/data/Makefile.am
index 8f7ebc0..1d5fe3b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,11 +11,11 @@ $(baobabapp_DATA): $(baobabapp_in_files)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = org.gnome.baobab.appdata.xml.in
-appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+appstream_in_files = org.gnome.baobab.appdata.xml.in
+appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+@APPSTREAM_XML_RULES@
 
-$(appdata_XML): $(appdata_in_files)
+$(appstream_XML): $(appstream_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 dbusservicedir = $(datadir)/dbus-1/services
@@ -38,14 +38,14 @@ EXTRA_DIST =                                \
        $(gsettingsschema_in_files)     \
        $(man_MANS)                     \
        $(baobabicon_DATA)              \
-       $(appdata_in_files)             \
+       $(appstream_in_files)           \
        $(NULL)
 
 CLEANFILES =                           \
        $(baobabapp_in_files)           \
        $(baobabapp_DATA)               \
        $(gsettings_SCHEMAS)            \
-       $(appdata_XML)                  \
+       $(appstream_XML)                \
        org.gnome.baobab.service        \
        $(NULL)
 
diff --git a/data/org.gnome.baobab.appdata.xml.in b/data/org.gnome.baobab.appdata.xml.in
index 671dac7..6c3612b 100644
--- a/data/org.gnome.baobab.appdata.xml.in
+++ b/data/org.gnome.baobab.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-  <id type="desktop">org.gnome.baobab.desktop</id>
+<component type="desktop">
+  <id>org.gnome.baobab.desktop</id>
   <licence>CC0</licence>
   <description>
     <p>
@@ -23,4 +23,4 @@
   <project_group>GNOME</project_group>
   <compulsory_for_desktop>GNOME</compulsory_for_desktop>
   <translation type="gettext">baobab</translation>
-</application>
+</component>