[gucharmap] Modernize metainfo file

[Matthias Klumpp <mak src gnome org>]

commit f18713345c62b680b1d577eda6a48a7ef8d22951
Author: Matthias Klumpp <matthias tenstral net>
Date:   Sat Jan 14 22:23:28 2017 +0100

    Modernize metainfo file

 data/Makefile.am              |    2 +-
 data/gucharmap.appdata.xml.in |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index bd39dec..7b89f10 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 appdata_in_files = gucharmap.appdata.xml.in
 nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
diff --git a/data/gucharmap.appdata.xml.in b/data/gucharmap.appdata.xml.in
index 4c89424..451defc 100644
--- a/data/gucharmap.appdata.xml.in
+++ b/data/gucharmap.appdata.xml.in
@@ -15,12 +15,11 @@
   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 type="desktop-application"
+  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">gucharmap.desktop</id>
+  <id>gucharmap.desktop</id>
   <metadata_license>GPL-3.0+</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <_name>Character Map</_name>
@@ -51,4 +50,4 @@
   <url type="homepage">https://wiki.gnome.org/Apps/Gucharmap</url>
   <project_group>GNOME</project_group>
   <translation type="gettext">gucharmap</translation>
-</application>
+</component>