[seahorse/wip/fix-app-id] data: consistently use our app ID

[Niels De Graef <nielsdg src gnome org>]

commit 40282e5075a180773239d1baf247650d6598127e
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon Jan 7 23:31:01 2019 +0100

    data: consistently use our app ID
    
    This fixes some issues with renaming for Flatpak and other things.

 build-aux/org.gnome.Seahorse.json                              |  2 --
 data/meson.build                                               | 10 +++++-----
 ...ta.xml.in => org.gnome.seahorse.Application.appdata.xml.in} |  6 +++++-
 ...ktop.in.in => org.gnome.seahorse.Application.desktop.in.in} |  0
 data/org.gnome.seahorse.convert                                |  6 ------
 data/org.gnome.seahorse.manager.convert                        |  6 ------
 6 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/build-aux/org.gnome.Seahorse.json b/build-aux/org.gnome.Seahorse.json
index 4ce43735..06232226 100644
--- a/build-aux/org.gnome.Seahorse.json
+++ b/build-aux/org.gnome.Seahorse.json
@@ -5,8 +5,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "seahorse",
     "desktop-file-name-prefix": "(Development) ",
-    "rename-desktop-file": "seahorse.desktop",
-    "rename-appdata-file": "seahorse.appdata.xml",
     "rename-icon": "seahorse",
     "copy-icon": true,
     "finish-args": [
diff --git a/data/meson.build b/data/meson.build
index a32e4653..53e82994 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,8 +18,8 @@ resources_src = gnome.compile_resources('seahorse-resources',
 
 # The appdata file
 i18n.merge_file(
-  input: 'seahorse.appdata.xml.in',
-  output: 'seahorse.appdata.xml',
+  input: 'org.gnome.seahorse.Application.appdata.xml.in',
+  output: 'org.gnome.seahorse.Application.appdata.xml',
   type: 'xml',
   po_dir: po_dir,
   install: true,
@@ -32,13 +32,13 @@ desktop_conf.set('bindir', bindir)
 
 # The desktop file
 configured_desktop_file = configure_file(
-  input: 'seahorse.desktop.in.in',
-  output: 'seahorse.desktop.in',
+  input: 'org.gnome.seahorse.Application.desktop.in.in',
+  output: 'org.gnome.seahorse.Application.desktop.in',
   configuration: desktop_conf,
 )
 i18n.merge_file(
   input: configured_desktop_file,
-  output: 'seahorse.desktop',
+  output: 'org.gnome.seahorse.Application.desktop',
   type: 'desktop',
   po_dir: po_dir,
   install: true,
diff --git a/data/seahorse.appdata.xml.in b/data/org.gnome.seahorse.Application.appdata.xml.in
similarity index 92%
rename from data/seahorse.appdata.xml.in
rename to data/org.gnome.seahorse.Application.appdata.xml.in
index 8c01744c..e69d28cf 100644
--- a/data/seahorse.appdata.xml.in
+++ b/data/org.gnome.seahorse.Application.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>seahorse.desktop</id>
+  <id>org.gnome.seahorse.Application</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and LGPL-2.0+</project_license>
   <name>Seahorse</name>
@@ -45,11 +45,15 @@
     </release>
   </releases>
 
+  <provides>
+    <binary>seahorse</binary>
+  </provides>
   <url type="homepage">https://wiki.gnome.org/Apps/Seahorse</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/seahorse/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/seahorse/stable/</url>
   <update_contact>seahorse-list gnome org</update_contact>
   <project_group>GNOME</project_group>
+  <launchable type="desktop-id">org.gnome.seahorse.Application.desktop</launchable>
   <translation type="gettext">seahorse</translation>
 </component>
diff --git a/data/seahorse.desktop.in.in b/data/org.gnome.seahorse.Application.desktop.in.in
similarity index 100%
rename from data/seahorse.desktop.in.in
rename to data/org.gnome.seahorse.Application.desktop.in.in