0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
as per freedesktop spec
This commit is contained in:
loonycyborg 2019-03-27 22:08:17 +03:00
parent 7797133fed
commit 798e809512
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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 # Install desktop file so wesnoth appears in the application start menu with an icon
# #
if(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME) 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 ) install(DIRECTORY packaging/icons/hicolor DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons )
endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME) endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
if(ENABLE_APPDATA_FILE 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) endif(ENABLE_APPDATA_FILE AND ENABLE_GAME)
if(ENABLE_SERVER AND FIFO_DIR) if(ENABLE_SERVER AND FIFO_DIR)

4
SConstruct
View file

@ -742,9 +742,9 @@ if env["nls"]:
InstallManpages(env, "wesnoth") InstallManpages(env, "wesnoth")
if have_client_prereqs and have_X and env["desktop_entry"]: if have_client_prereqs and have_X and env["desktop_entry"]:
env.InstallData("icondir", "wesnoth", "packaging/icons") 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"]: 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 # Python tools
env.InstallData("bindir", "pytools", [os.path.join("data", "tools", tool) for tool in pythontools]) env.InstallData("bindir", "pytools", [os.path.join("data", "tools", tool) for tool in pythontools])

4
packaging/flatpak/org.wesnoth.Wesnoth.json
View file

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

4
packaging/wesnoth.appdata.xml → packaging/org.wesnoth.Wesnoth.appdata.xml
View file

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

0
packaging/wesnoth.desktop → packaging/org.wesnoth.Wesnoth.desktop
View file