Update .appdata and .desktop files

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f54ba54ba652026327283bcdc53929722d4c27..d2568a9ae07d0d8f37855153ec411164a2976c07 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,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(APPDATADIR "unix/metainfo")
                set(ICONDIR "unix/icons")
                set(LOCALEDIR "locale")
        else()
@@ -92,7 +92,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(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/metainfo")
                set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
                set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
        endif()
@@ -173,8 +173,8 @@ install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
        install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-       install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-       install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
+       install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+       install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
        install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
        install(FILES "misc/minetest-xorg-icon-128.png"
                DESTINATION "${ICONDIR}/hicolor/128x128/apps"

diff --git a/misc/minetest.appdata.xml b/misc/minetest.appdata.xml
deleted file mode 100644 (file)
index 65acf96..0000000
--- a/misc/minetest.appdata.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
-       <id type="desktop">minetest.desktop</id>
-       <metadata_license>CC0-1.0</metadata_license>
-       <project_license>LGPL-2.1+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
-       <name>Minetest</name>
-       <summary>Multiplayer infinite-world block sandbox game</summary>
-       <description>
-               <p>
-                       Minetest 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>
-                       Minetest is designed to be simple, stable, and portable.
-                       It is lightweight enough to run on fairly old hardware.
-               </p><p>
-                       Minetest 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="1920" height="1080">http://www.minetest.net/media/gallery/1.jpg</screenshot>
-               <screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</screenshot>
-               <screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</screenshot>
-       </screenshots>
-       <keywords>
-               <keyword>sandbox</keyword>
-               <keyword>world</keyword>
-               <keyword>mining</keyword>
-               <keyword>multiplayer</keyword>
-       </keywords>
-       <url type="homepage">http://minetest.net</url>
-       <url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url>
-       <url type="translate">http://dev.minetest.net/Translation</url>
-       <url type="donation">http://www.minetest.net/development/#donate</url>
-       <updatecontact>sfan5@live.de</updatecontact>
-</application>

diff --git a/misc/minetest.desktop b/misc/minetest.desktop
deleted file mode 100644 (file)
index ca493c4..0000000
--- a/misc/minetest.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Minetest
-GenericName=Minetest
-Comment=Multiplayer infinite-world block sandbox
-Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
-Comment[es]=Juego sandbox multijugador con mundos infinitos
-Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
-Comment[ja]=マルチプレイに対応した、無限の世界のブロック型サンドボックスゲームです
-Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
-Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
-Exec=minetest
-Icon=minetest
-Terminal=false
-Type=Application
-Categories=Game;Simulation;
-StartupNotify=false
-Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;

diff --git a/misc/net.minetest.minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml
new file mode 100644 (file)
index 0000000..277225d
--- /dev/null
+++ b/misc/net.minetest.minetest.appdata.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+       <id>net.minetest.minetest.desktop</id>
+       <metadata_license>CC0-1.0</metadata_license>
+       <project_license>LGPL-2.1+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
+       <name>Minetest</name>
+       <summary>Multiplayer infinite-world block sandbox game</summary>
+       <description>
+               <p>
+                       Minetest 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>
+                       Minetest is designed to be simple, stable, and portable.
+                       It is lightweight enough to run on fairly old hardware.
+               </p><p>
+                       Minetest 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">
+                       <image width="1920" height="1080">http://www.minetest.net/media/gallery/1.jpg</image>
+               </screenshot>
+               <screenshot>
+                       <image width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</image>
+               </screenshot>
+               <screenshot>
+                       <image width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</image>
+               </screenshot>
+       </screenshots>
+       <keywords>
+               <keyword>sandbox</keyword>
+               <keyword>world</keyword>
+               <keyword>mining</keyword>
+               <keyword>multiplayer</keyword>
+       </keywords>
+       <url type="homepage">http://minetest.net</url>
+       <url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url>
+       <url type="translate">http://dev.minetest.net/Translation</url>
+       <url type="donation">http://www.minetest.net/development/#donate</url>
+       <url type="faq">http://wiki.minetest.net/FAQ</url>
+       <url type="help">http://wiki.minetest.net</url>
+       <provides>
+               <binary>minetest</binary>
+       </provides>
+       <translation type="gettext">minetest</translation>
+       <update_contact>sfan5@live.de</update_contact>
+</component>

diff --git a/misc/net.minetest.minetest.desktop b/misc/net.minetest.minetest.desktop
new file mode 100644 (file)
index 0000000..ca493c4
--- /dev/null
+++ b/misc/net.minetest.minetest.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Name=Minetest
+GenericName=Minetest
+Comment=Multiplayer infinite-world block sandbox
+Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
+Comment[es]=Juego sandbox multijugador con mundos infinitos
+Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
+Comment[ja]=マルチプレイに対応した、無限の世界のブロック型サンドボックスゲームです
+Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
+Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
+Exec=minetest
+Icon=minetest
+Terminal=false
+Type=Application
+Categories=Game;Simulation;
+StartupNotify=false
+Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;