Rename appdata and desktop files to contain D-Bus well-known name

as per freedesktop spec

CMakeLists.txt

@@ -596,12 +596,12 @@ endif(ENABLE_CAMPAIGN_SERVER AND NOT ENABLE_GAME)
 # Install desktop file so wesnoth appears in the application start menu with an icon
 #
 if(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
-	install(FILES packaging/wesnoth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
+	install(FILES packaging/org.wesnoth.Wesnoth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
 	install(DIRECTORY packaging/icons/hicolor DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons )
 endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
 
 if(ENABLE_APPDATA_FILE AND ENABLE_GAME)
-	install(FILES packaging/wesnoth.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo )
+	install(FILES packaging/org.wesnoth.Wesnoth.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo )
 endif(ENABLE_APPDATA_FILE AND ENABLE_GAME)
 
 if(ENABLE_SERVER AND FIFO_DIR)

SConstruct

@@ -742,9 +742,9 @@ if env["nls"]:
 InstallManpages(env, "wesnoth")
 if have_client_prereqs and have_X and env["desktop_entry"]:
      env.InstallData("icondir", "wesnoth", "packaging/icons")
-     env.InstallData("desktopdir", "wesnoth", "packaging/wesnoth.desktop")
+     env.InstallData("desktopdir", "wesnoth", "packaging/org.wesnoth.Wesnoth.desktop")
 if have_client_prereqs and "linux" in sys.platform and env["appdata_file"]:
-     env.InstallData("appdatadir", "wesnoth", "packaging/wesnoth.appdata.xml")
+     env.InstallData("appdatadir", "wesnoth", "packaging/org.wesnoth.Wesnoth.appdata.xml")
 
 # Python tools
 env.InstallData("bindir", "pytools", [os.path.join("data", "tools", tool) for tool in pythontools])

packaging/flatpak/org.wesnoth.Wesnoth.json

@@ -11,8 +11,6 @@
         "--socket=pulseaudio"
     ],
     "command": "wesnoth",
-    "rename-appdata-file": "wesnoth.appdata.xml",
-    "rename-desktop-file": "wesnoth.desktop",
     "rename-icon": "wesnoth-icon",
     "cleanup": [
         "/include",
@@ -108,7 +106,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "path": "/usr/src/wesnoth/master",
+                    "path": "/home/sergey/vcs-checkouts/wesnoth",
                     "branch": "master"
                 }
             ]

packaging/org.wesnoth.Wesnoth.appdata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 The Battle for Wesnoth Project -->
 <component type="desktop">
-  <id>wesnoth.desktop</id>
-  <launchable type="desktop-id">wesnoth.desktop</launchable>
+  <id>org.wesnoth.Wesnoth.desktop</id>
+  <launchable type="desktop-id">org.wesnoth.Wesnoth.desktop</launchable>
   <metadata_license>GFDL-1.3</metadata_license>
   <project_license>GPL-2.0-or-later</project_license>
   <name>Battle for Wesnoth</name>