Merge commit '5b3bbde' into merge3

Conflicts:
	CMakeLists.txt
This commit is contained in:
proller 2014-06-22 05:12:57 +04:00
commit 7eaffa2f21
2 changed files with 39 additions and 0 deletions

View File

@ -88,6 +88,7 @@ elseif(UNIX) # Linux, BSD etc
set(EXAMPLE_CONF_DIR ".")
set(MANDIR "unix/man")
set(XDG_APPS_DIR "unix/applications")
set(APPDATADIR "unix/appdata")
set(ICONDIR "unix/icons")
set(LOCALEDIR "locale")
else()
@ -97,6 +98,7 @@ elseif(UNIX) # Linux, BSD etc
set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
set(EXAMPLE_CONF_DIR ${DOCDIR})
set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
endif()
@ -172,6 +174,7 @@ install(FILES "freeminer.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
if(UNIX)
install(FILES "doc/freeminer.6" "doc/freeminerserver.6" DESTINATION "${MANDIR}/man6")
install(FILES "misc/freeminer.desktop" DESTINATION "${XDG_APPS_DIR}")
install(FILES "misc/freeminer.appdata.xml" DESTINATION "${APPDATADIR}")
install(FILES "misc/freeminer.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
endif()

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">freeminer.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3 and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
<name>Freeminer</name>
<summary>Multiplayer infinite-world block sandbox game</summary>
<description>
<p>
Freeminer is an infinite-world block sandbox game and game engine.
</p><p>
Players can create and destroy various types of blocks in a
three-dimensional open world. This allows forming structures in
every possible creation, on multiplayer servers or in singleplayer.
</p><p>
Freeminer is designed to be simple, stable, and portable.
It is lightweight enough to run on fairly old hardware.
</p><p>
Freeminer has many features, including:
</p>
<ul>
<li>Ability to walk around, dig, and build in a near-infinite voxel world</li>
<li>Crafting of items from raw materials</li>
<li>Fast and able to run on old and slow hardware</li>
<li>A simple modding API that supports many additions and modifications to the game</li>
<li>Multiplayer support via servers hosted by users</li>
<li>Beautiful lightning-fast map generator</li>
</ul>
</description>
<screenshots>
<screenshot type="default" width="1440" height="851">http://minetest.net/_media/screen2.png</screenshot>
<screenshot width="1440" height="851">http://minetest.net/_media/screenshot_4032289578.png</screenshot>
</screenshots>
<url type="homepage">http://freeminer.org</url>
<updatecontact></updatecontact>
</application>