[five-or-more] Use reverse domain naming

[Robert Roth <robertroth src gnome org>]

commit 83c5d5081288ce02793575a6028c741cfcd7bdfc
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Oct 8 20:39:13 2018 +0300

    Use reverse domain naming

 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 .../{five-or-more.png => org.gnome.five-or-more.png}      | Bin
 ...e-symbolic.svg => org.gnome.five-or-more-symbolic.svg} |   0
 data/meson.build                                          |  14 ++++++++------
 ...pdata.xml.in => org.gnome.five-or-more.appdata.xml.in} |   2 +-
 ...-more.desktop.in => org.gnome.five-or-more.desktop.in} |   2 +-
 org.gnome.five-or-more.json                               |   4 ----
 src/main.vala                                             |   4 ++--
 13 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/five-or-more.png b/data/icons/hicolor/16x16/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/16x16/five-or-more.png
rename to data/icons/hicolor/16x16/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/22x22/five-or-more.png b/data/icons/hicolor/22x22/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/22x22/five-or-more.png
rename to data/icons/hicolor/22x22/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/24x24/five-or-more.png b/data/icons/hicolor/24x24/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/24x24/five-or-more.png
rename to data/icons/hicolor/24x24/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/256x256/five-or-more.png 
b/data/icons/hicolor/256x256/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/256x256/five-or-more.png
rename to data/icons/hicolor/256x256/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/32x32/five-or-more.png b/data/icons/hicolor/32x32/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/32x32/five-or-more.png
rename to data/icons/hicolor/32x32/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/48x48/five-or-more.png b/data/icons/hicolor/48x48/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/48x48/five-or-more.png
rename to data/icons/hicolor/48x48/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/512x512/five-or-more.png 
b/data/icons/hicolor/512x512/org.gnome.five-or-more.png
similarity index 100%
rename from data/icons/hicolor/512x512/five-or-more.png
rename to data/icons/hicolor/512x512/org.gnome.five-or-more.png
diff --git a/data/icons/hicolor/symbolic/five-or-more-symbolic.svg 
b/data/icons/hicolor/symbolic/org.gnome.five-or-more-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/five-or-more-symbolic.svg
rename to data/icons/hicolor/symbolic/org.gnome.five-or-more-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index 52ffc59..aafbc15 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,8 @@
+desktop = 'org.gnome.five-or-more.desktop'
 # Desktop file
 i18n.merge_file (
-  input: 'five-or-more.desktop.in',
-  output: 'five-or-more.desktop',
+  input: desktop + '.in',
+  output: desktop,
   type: 'desktop',
   po_dir: po_dir,
   install: true,
@@ -24,19 +25,20 @@ endforeach
 
 # Icons
 foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', '512x512' ]
-    install_data(join_paths('icons', 'hicolor', size, 'five-or-more.png'),
+    install_data(join_paths('icons', 'hicolor', size, 'org.gnome.five-or-more.png'),
                  install_dir: join_paths (data_dir, 'icons', 'hicolor', size, 'apps')
     )
 endforeach
 
-install_data (join_paths ('icons', 'hicolor', 'symbolic', 'five-or-more-symbolic.svg'),
+install_data (join_paths ('icons', 'hicolor', 'symbolic', 'org.gnome.five-or-more-symbolic.svg'),
              install_dir: join_paths (data_dir, 'icons', 'hicolor', 'symbolic', 'apps')
              )
 
+appdata = 'org.gnome.five-or-more.appdata.xml'
 # Appdata
 i18n.merge_file (
-  input: 'five-or-more.appdata.xml.in',
-  output: 'five-or-more.appdata.xml',
+  input: appdata + '.in',
+  output: appdata,
   type: 'xml',
   po_dir: po_dir,
   install: true,
diff --git a/data/five-or-more.appdata.xml.in b/data/org.gnome.five-or-more.appdata.xml.in
similarity index 98%
rename from data/five-or-more.appdata.xml.in
rename to data/org.gnome.five-or-more.appdata.xml.in
index 01c9801..91fe10d 100644
--- a/data/five-or-more.appdata.xml.in
+++ b/data/org.gnome.five-or-more.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
 <component type="desktop">
-  <id>five-or-more.desktop</id>
+  <id>org.gnome.five-or-more.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Five or More</name>
diff --git a/data/five-or-more.desktop.in b/data/org.gnome.five-or-more.desktop.in
similarity index 94%
rename from data/five-or-more.desktop.in
rename to data/org.gnome.five-or-more.desktop.in
index f3fcc44..f0d5a9f 100644
--- a/data/five-or-more.desktop.in
+++ b/data/org.gnome.five-or-more.desktop.in
@@ -5,7 +5,7 @@ Comment=Remove colored balls from the board by forming lines
 Keywords=game;strategy;logic;
 Exec=five-or-more
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=five-or-more
+Icon=org.gnome.five-or-more
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/org.gnome.five-or-more.json b/org.gnome.five-or-more.json
index a051cd6..8cb2c55 100644
--- a/org.gnome.five-or-more.json
+++ b/org.gnome.five-or-more.json
@@ -7,8 +7,6 @@
     "tags" : [
         "nightly"
     ],
-    "rename-icon" : "five-or-more",
-    "rename-desktop-file" : "five-or-more.desktop",
     "desktop-file-name-prefix" : "(Nightly) ",
     "finish-args" : [
         "--share=ipc",
@@ -22,8 +20,6 @@
     "build-options" : {
         "cflags" : "-O2 -g",
         "cxxflags" : "-O2 -g",
-        "env" : {
-        }
     },
     "modules" : [
         {
diff --git a/src/main.vala b/src/main.vala
index b89a580..b93b429 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -66,7 +66,7 @@ public class FiveOrMoreApp: Gtk.Application
     public static int main (string[] args)
     {
         Environment.set_application_name (_("Five or More"));
-        Gtk.Window.set_default_icon_name ("five-or-more");
+        Gtk.Window.set_default_icon_name ("org.gnome.five-or-more");
 
         var app = new FiveOrMoreApp ();
         return app.run (args);
@@ -144,7 +144,7 @@ public class FiveOrMoreApp: Gtk.Application
 
         Gtk.show_about_dialog (window,
                                "program-name", _("Five or More"),
-                               "logo-icon-name", "five-or-more",
+                               "logo-icon-name", "org.gnome.five-or-more",
                                "version", VERSION,
                                "comments", _("GNOME port of the once-popular Color Lines game"),
                                "copyright", copyright,