[frogr] Use the Application ID for the desktop and appdata files too

[Mario Sanchez Prada <msanchez src gnome org>]

commit 73083899ab1dbda3b420a27c0b6cf974963e378d
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sun Apr 30 23:00:30 2017 +0100

    Use the Application ID for the desktop and appdata files too
    
    More cleanup and making life easier when bundling as a flatpak.

 Makefile.am                                        |    6 +++---
 data/Makefile.am                                   |    8 ++++----
 ...pdata.xml.in => org.gnome.frogr.appdata.xml.in} |    0
 ...desktop.in.in => org.gnome.frogr.desktop.in.in} |    0
 org.gnome.frogr-stable.json                        |    2 --
 org.gnome.frogr-unstable.json                      |    2 --
 po/POTFILES.in                                     |    4 ++--
 po/POTFILES.skip                                   |    2 +-
 8 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5358ffc..cbc4cac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,9 @@ MAINTAINERCLEANFILES = \
        config.h.in~ \
        config.sub \
        configure \
-       data/frogr.appdata.xml \
-       data/frogr.desktop \
-       data/frogr.desktop.in \
+       data/org.gnome.frogr.appdata.xml \
+       data/org.gnome.frogr.desktop \
+       data/org.gnome.frogr.desktop.in \
        debian/files \
        debian/stamp-autotools-files \
        debian/stamp-makefile-build \
diff --git a/data/Makefile.am b/data/Makefile.am
index 4050ab4..d017dc2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,17 +1,17 @@
 desktopdir = $(datadir)/applications
-desktop_in_files = frogr.desktop.in.in
+desktop_in_files = org.gnome.frogr.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 edit = sed -e 's,@BINDIR\@,$(bindir),g' -e 's,@PIXMAPDIR\@,$(datadir)\/pixmaps,g'
-frogr.desktop.in: frogr.desktop.in.in
-       $(edit) $(srcdir)/frogr.desktop.in.in > $(builddir)/frogr.desktop.in
+org.gnome.frogr.desktop.in: org.gnome.frogr.desktop.in.in
+       $(edit) $(srcdir)/org.gnome.frogr.desktop.in.in > $(builddir)/org.gnome.frogr.desktop.in
 
 %.desktop: %.desktop.in
        msgfmt --desktop -d $(top_srcdir)/po \
                --template $< -o $@
 
 appdatadir = $(datadir)/appdata
-appdata_in_files = frogr.appdata.xml.in
+appdata_in_files = org.gnome.frogr.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 $(appdata_DATA): $(appdata_in_files)
diff --git a/data/frogr.appdata.xml.in b/data/org.gnome.frogr.appdata.xml.in
similarity index 100%
rename from data/frogr.appdata.xml.in
rename to data/org.gnome.frogr.appdata.xml.in
diff --git a/data/frogr.desktop.in.in b/data/org.gnome.frogr.desktop.in.in
similarity index 100%
rename from data/frogr.desktop.in.in
rename to data/org.gnome.frogr.desktop.in.in
diff --git a/org.gnome.frogr-stable.json b/org.gnome.frogr-stable.json
index 36d63f3..1aabf86 100644
--- a/org.gnome.frogr-stable.json
+++ b/org.gnome.frogr-stable.json
@@ -5,8 +5,6 @@
     "branch": "stable",
     "sdk": "org.gnome.Sdk",
     "command": "frogr",
-    "rename-appdata-file": "frogr.appdata.xml",
-    "rename-desktop-file": "frogr.desktop",
     "finish-args": [
         /* X11 + XShm access */
         "--share=ipc", "--socket=x11",
diff --git a/org.gnome.frogr-unstable.json b/org.gnome.frogr-unstable.json
index cec947f..ac4e52f 100644
--- a/org.gnome.frogr-unstable.json
+++ b/org.gnome.frogr-unstable.json
@@ -4,8 +4,6 @@
     "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "command": "frogr",
-    "rename-appdata-file": "frogr.appdata.xml",
-    "rename-desktop-file": "frogr.desktop",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": [
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 12bb94a..1479843 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
-data/frogr.appdata.xml.in
-data/frogr.desktop.in.in
+data/org.gnome.frogr.appdata.xml.in
+data/org.gnome.frogr.desktop.in.in
 src/frogr-about-dialog.c
 src/frogr-add-tags-dialog.c
 src/frogr-add-to-group-dialog.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index f678f14..e1f4388 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,2 @@
-data/frogr.desktop.in
+data/org.gnome.frogr.desktop.in