[geary/gnome-3-32] Merge branch 'wip/kalev/appdata-id' into mainline

[Michael Gratton <mjog src gnome org>]

commit e7209ffeefb3490e76ef7e2b9668499dca653010
Author: Michael James Gratton <mike vee net>
Date:   Wed Apr 24 02:17:40 2019 +0000

    Merge branch 'wip/kalev/appdata-id' into mainline
    
    
    (cherry picked from commit e1b31183ceda52c4a921c7882632c5719cb6b712)
    
    499eb22e appdata: Keep the same app ID as in 0.13

 desktop/org.gnome.Geary.appdata.xml.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/desktop/org.gnome.Geary.appdata.xml.in b/desktop/org.gnome.Geary.appdata.xml.in
index 81194031..592bf18b 100644
--- a/desktop/org.gnome.Geary.appdata.xml.in
+++ b/desktop/org.gnome.Geary.appdata.xml.in
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Software Freedom Conservancy Inc. -->
-<!-- Copyright 2016 Michael Gratton <mike vee net> -->
+<!-- Copyright 2016, 2019 Michael Gratton <mike vee net> -->
+
 <component type="desktop-application">
-  <id>org.gnome.Geary</id>
+  <id>org.gnome.Geary.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1+</project_license>
   <update_contact>geary-list gnome org</update_contact>
@@ -73,6 +74,16 @@
     <kudo>UserDocs</kudo>
   </kudos>
 
+  <provides>
+    <!--
+        See https://gitlab.gnome.org/GNOME/geary/merge_requests/203
+        for why the appstream id uses the desktop file name as an id
+        and the proper app id is listed here here, instead of the
+        other way around.
+    -->
+    <id>org.gnome.Geary</id>
+  </provides>
+
   <launchable type="desktop-id">org.gnome.Geary.desktop</launchable>
 
   <translation type="gettext">geary</translation>