diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /misc | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/debpkg-control | 36 | ||||
| -rw-r--r-- | misc/net.minetest.minetest.appdata.xml (renamed from misc/minetest.appdata.xml) | 26 | ||||
| -rw-r--r-- | misc/net.minetest.minetest.desktop (renamed from misc/minetest.desktop) | 0 |
3 files changed, 55 insertions, 7 deletions
diff --git a/misc/debpkg-control b/misc/debpkg-control new file mode 100644 index 000000000..b228f4c79 --- /dev/null +++ b/misc/debpkg-control @@ -0,0 +1,36 @@ +Section: games +Priority: extra +Standards-Version: 3.6.2 +Package: minetest-staging +Version: 0.4.15-DATEPLACEHOLDER +Depends: libc6, libcurl3-gnutls, libfreetype6, libirrlicht1.8, LEVELDB_PLACEHOLDER, liblua5.1-0, libluajit-5.1-2, libopenal1, libstdc++6, libvorbisfile3, libx11-6, zlib1g +Maintainer: Loic Blot <loic.blot@unix-experience.fr> +Homepage: http://minetest.net/ +Vcs-Git: https://github.com/minetest/minetest.git +Vcs-Browser: https://github.com/minetest/minetest.git +Architecture: amd64 +Build-Depends: + cmake, + gettext, + libbz2-dev, + libcurl4-gnutls-dev, + libfreetype6-dev, + libglu1-mesa-dev, + libirrlicht-dev (>= 1.7.0), + libjpeg-dev, + libjsoncpp-dev, + libleveldb-dev, + libluajit-5.1-dev | liblua5.1-dev, + libogg-dev, + libopenal-dev, + libpng-dev, + libsqlite3-dev, + libvorbis-dev, + libx11-dev, + zlib1g-dev +Description: Multiplayer infinite-world block sandbox (server) + Minetest is a minecraft-inspired game written from scratch and licensed + under the LGPL (version 2.1 or later). It supports both survival and creative + modes along with multiplayer support, dynamic lighting, and an "infinite" map + generator. +Conflicts: minetestc55, minetest, minetest-server, minetest-data diff --git a/misc/minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml index 65acf96ec..277225d4b 100644 --- a/misc/minetest.appdata.xml +++ b/misc/net.minetest.minetest.appdata.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<application> - <id type="desktop">minetest.desktop</id> +<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> @@ -28,9 +28,15 @@ </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> + <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> @@ -42,5 +48,11 @@ <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> + <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/minetest.desktop b/misc/net.minetest.minetest.desktop index ca493c44e..ca493c44e 100644 --- a/misc/minetest.desktop +++ b/misc/net.minetest.minetest.desktop |