[easytag/wip/flatpak: 33/35] Rename desktop file to match application ID

[David King <davidk src gnome org>]

commit 4adaf48619e109865b7e01b74c2fed11468bd010
Author: David King <amigadave amigadave com>
Date:   Fri Apr 22 15:19:50 2016 +0530

    Rename desktop file to match application ID
    
    This makes it easier to bundle with flatpak.

 .gitignore                                         |    2 +-
 Makefile.am                                        |    2 +-
 data/easytag.appdata.xml.in                        |    2 +-
 data/flatpak/easytag.json                          |    1 -
 ...tag.desktop.in => org.gnome.EasyTAG.desktop.in} |    0
 po/POTFILES.in                                     |    2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3cb339d..9dc087c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ configure
 /data/easytag.appdata.valid
 /data/easytag.appdata.xml
 /data/easytag-nautilus.metainfo.xml
-/data/easytag.desktop
+/data/org.gnome.EasyTAG.desktop
 /doc/easytag.1
 /doc/version.xml
 /doc/easytag.1
diff --git a/Makefile.am b/Makefile.am
index 7f4ba1d..9afb009 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,7 +286,7 @@ appdata_XML = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = data/easytag.desktop.in
+desktop_in_files = data/org.gnome.EasyTAG.desktop.in
 $(desktop_in_files:.desktop.in=.desktop): data/.dstamp
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
diff --git a/data/easytag.appdata.xml.in b/data/easytag.appdata.xml.in
index caaa509..aab70ff 100644
--- a/data/easytag.appdata.xml.in
+++ b/data/easytag.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 David King <amigadave amigadave com> -->
 <component type="desktop">
-    <id>easytag.desktop</id>
+    <id>org.gnome.EasyTAG.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0+</project_license>
 
diff --git a/data/flatpak/easytag.json b/data/flatpak/easytag.json
index c585c73..1118b04 100644
--- a/data/flatpak/easytag.json
+++ b/data/flatpak/easytag.json
@@ -6,7 +6,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "easytag",
     "rename-appdata-file": "easytag.appdata.xml",
-    "rename-desktop-file": "easytag.desktop",
     "rename-icon": "easytag",
     "finish-args": ["--filesystem=host",
                     "--share=ipc",
diff --git a/data/easytag.desktop.in b/data/org.gnome.EasyTAG.desktop.in
similarity index 100%
rename from data/easytag.desktop.in
rename to data/org.gnome.EasyTAG.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf056bb..c5d9c62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 data/easytag.appdata.xml.in
-data/easytag.desktop.in
+data/org.gnome.EasyTAG.desktop.in
 data/easytag-nautilus.metainfo.xml.in
 [type: gettext/glade]data/browser.ui
 [type: gettext/glade]data/browser_dialogs.ui