[glade/bilelmoussaoui/rdnn-app-id: 3/3] RDNN appdata & desktop file

[Alberto Fanjul <albfan src gnome org>]

commit a45ec9434990f17d07cbbe74ba9864e2d63582da
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Fri Sep 13 03:29:19 2019 +0200

    RDNN appdata & desktop file
    
    Rename the appdata file & desktop file to follow the new freedesktop standards

 data/.gitignore                                      |  6 +++---
 data/Makefile.am                                     |  4 ++--
 data/meson.build                                     | 20 ++++++++------------
 ...appdata.xml.in => org.gnome.Glade.appdata.xml.in} |  0
 ...e.desktop.in.in => org.gnome.Glade.desktop.in.in} |  0
 org.gnome.Glade.json                                 |  2 --
 po/POTFILES.in                                       |  4 ++--
 7 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/data/.gitignore b/data/.gitignore
index c6e26ba7..b43bfedb 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,4 +1,4 @@
-/glade.desktop
-/glade.desktop.in
+/org.gnome.Glade.desktop
+/org.gnome.Glade.desktop.in
 /gladeui-1.0.pc
-/glade.appdata.xml
+/org.gnome.Glade.appdata.xml
diff --git a/data/Makefile.am b/data/Makefile.am
index e685d0c8..c26bf2aa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = icons gettext
 
 desktopdir = $(datadir)/applications
-desktop_in_files = glade.desktop.in.in
+desktop_in_files = org.gnome.Glade.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
@@ -13,7 +13,7 @@ pkgconfig_DATA = gladeui-2.0.pc
 
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = glade.appdata.xml.in
+appdata_in_files = org.gnome.Glade.appdata.xml.in
 $(appdata_DATA): $(appdata_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
diff --git a/data/meson.build b/data/meson.build
index 9ce56c4a..9f244566 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,18 +1,14 @@
 desktop_conf = configuration_data()
 desktop_conf.set('VERSION', glade_version)
 
-desktop = glade_name + '.desktop'
-
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: '@BASENAME@',
-  configuration: desktop_conf,
-)
-
 i18n.merge_file(
-  desktop,
+  'desktop',
   type: 'desktop',
-  input: desktop_in,
+  input: configure_file(
+    input: 'org.gnome.Glade.desktop.in.in',
+    output: '@BASENAME@',
+    configuration: desktop_conf,
+  ),
   output: '@BASENAME@',
   po_dir: po_dir,
   install: true,
@@ -22,8 +18,8 @@ i18n.merge_file(
 appdata = glade_name + '.appdata.xml'
 
 i18n.merge_file(
-  appdata,
-  input: appdata + '.in',
+  'appdata',
+  input: 'org.gnome.Glade.appdata.xml.in',
   output: '@BASENAME@',
   po_dir: po_dir,
   install: true,
diff --git a/data/glade.appdata.xml.in b/data/org.gnome.Glade.appdata.xml.in
similarity index 100%
rename from data/glade.appdata.xml.in
rename to data/org.gnome.Glade.appdata.xml.in
diff --git a/data/glade.desktop.in.in b/data/org.gnome.Glade.desktop.in.in
similarity index 100%
rename from data/glade.desktop.in.in
rename to data/org.gnome.Glade.desktop.in.in
diff --git a/org.gnome.Glade.json b/org.gnome.Glade.json
index 05798304..9b9eca67 100644
--- a/org.gnome.Glade.json
+++ b/org.gnome.Glade.json
@@ -4,8 +4,6 @@
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "glade",
-    "rename-desktop-file" : "glade.desktop",
-    "rename-appdata-file" : "glade.appdata.xml",
     "tags" : [
         "nightly"
     ],
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c74fe5dc..c9d130cc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
 # List of source files containing translatable strings.
 
 # Main application
-data/glade.desktop.in.in
-data/glade.appdata.xml.in
+data/org.gnome.Glade.desktop.in.in
+data/org.gnome.Glade.appdata.xml.in
 src/glade-window.c
 src/main.c
 src/glade.glade