[gnome-terminal] Modernize metainfo files

[Matthias Klumpp <mak src gnome org>]

commit 522fc8e4340229bf8c83fa5408032fda20c4f930
Author: Matthias Klumpp <matthias tenstral net>
Date:   Sat Jan 14 22:32:32 2017 +0100

    Modernize metainfo files

 Makefile.am                                 |    2 +-
 org.gnome.Terminal.Nautilus.metainfo.xml.in |    5 ++---
 org.gnome.Terminal.appdata.xml.in           |   14 +++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a91c0fa..e4195b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ appdata_in_files = \
        org.gnome.Terminal.Nautilus.metainfo.xml.in \
        $(NULL)
 
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 nodist_appdata_DATA = \
        org.gnome.Terminal.appdata.xml \
        $(NULL)
diff --git a/org.gnome.Terminal.Nautilus.metainfo.xml.in b/org.gnome.Terminal.Nautilus.metainfo.xml.in
index 68da2ca..2943479 100644
--- a/org.gnome.Terminal.Nautilus.metainfo.xml.in
+++ b/org.gnome.Terminal.Nautilus.metainfo.xml.in
@@ -15,9 +15,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<!-- FIXME: the xmlns for appdata is made-up -->
 <component
-  xmlns="https://www.freedesktop.org/standards/appdata/1.0";
+  xmlns="https://specifications.freedesktop.org/metainfo/1.0";
   xmlns:xi="http://www.w3.org/2001/XInclude";
   xmlns:its="http://www.w3.org/2005/11/its";
   type="addon">
@@ -32,6 +31,6 @@
   </description>
   <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
   <project_group>GNOME</project_group>
-  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
+  <update_contact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</update_contact>
   <translation type="gettext">gnome-terminal</translation>
 </component>
diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in
index fa10599..6e9af48 100644
--- a/org.gnome.Terminal.appdata.xml.in
+++ b/org.gnome.Terminal.appdata.xml.in
@@ -15,12 +15,12 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<!-- FIXME: the xmlns for appdata is made-up -->
-<application
-  xmlns="https://www.freedesktop.org/standards/appdata/1.0";
+<component
+  xmlns="https://specifications.freedesktop.org/metainfo/1.0";
   xmlns:xi="http://www.w3.org/2001/XInclude";
-  xmlns:its="http://www.w3.org/2005/11/its";>
-  <id type="desktop">org.gnome.Terminal.desktop</id>
+  xmlns:its="http://www.w3.org/2005/11/its";
+  type="desktop-application">
+  <id>org.gnome.Terminal.desktop</id>
   <metadata_license>GPL-3.0+</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <_name>Terminal</_name>
@@ -43,5 +43,5 @@
   <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
   <project_group>GNOME</project_group>
   <compulsory_for_desktop>GNOME</compulsory_for_desktop>
-  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
-</application>
+  <update_contact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</update_contact>
+</component>