From c5061d81b972d9b846359d6b9be1c5a0fc4a2402 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 16 Dec 2017 16:12:18 -0800
Subject: [PATCH] * etc/emacs.appdata.xml: Update file format.

---
 etc/emacs.appdata.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml
index c3b1afb6284..6d9df8bf0b5 100644
--- a/etc/emacs.appdata.xml
+++ b/etc/emacs.appdata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (C) 2014-2017 Free Software Foundation, Inc. -->
-<application>
- <id type="desktop">emacs.desktop</id>
- <metadata_license>GFDL-1.3</metadata_license>
- <!-- It is GFDL-1.3+, but appdata-validate complains... -->
- <project_license>GPL-3.0+ and GFDL-1.3</project_license>
+<component type="desktop-application">
+ <id>org.gnu.emacs</id>
+ <metadata_license>GFDL-1.3+</metadata_license>
+ <project_license>GPL-3.0+ and GFDL-1.3+</project_license>
  <name>GNU Emacs</name>
  <summary>An extensible text editor</summary>
  <description>
@@ -25,9 +24,12 @@
   </ul>
  </description>
  <screenshots>
-  <screenshot type="default" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata.png</screenshot>
+  <screenshot type="default">
+  <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata.png</image>
+ </screenshot>
  </screenshots>
+ <launchable type="desktop-id">emacs</launchable>
  <url type="homepage">https://www.gnu.org/software/emacs</url>
- <updatecontact>emacs-devel_at_gnu.org</updatecontact>
+ <update_contact>emacs-devel_AT_gnu.org</update_contact>
  <project_group>GNU</project_group>
-</application>
+</component>
-- 
2.39.5