diff --git a/packaging/Slackbuild/glest/README b/packaging/Slackbuild/glest/README index 3a540969d..0fb83e1c6 100644 --- a/packaging/Slackbuild/glest/README +++ b/packaging/Slackbuild/glest/README @@ -1,5 +1,5 @@ Glest is a network multi-player real-time strategy game engine. -It's shipped with the GlestPack mod, which includes several factions, +It includes several factions, each one consisting of many 3d characters. The factions are loosely based on historical empires with added elements of fantasy, such as mummies produced by Egyptian priests, Indian shamans who summon diff --git a/packaging/Slackbuild/glest/README.Slackware b/packaging/Slackbuild/glest/README.Slackware index 048f73d2f..458cb0db8 100644 --- a/packaging/Slackbuild/glest/README.Slackware +++ b/packaging/Slackbuild/glest/README.Slackware @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/glest/glest-source.svg?branch=develop)](https://travis-ci.org/glest/glest-source) +[![Build Status](https://travis-ci.org/glest/glest-source.svg?branch=master)](https://travis-ci.org/glest/glest-source) # Glest @@ -21,10 +21,10 @@ CPU is also available. Additionally, if you want to contribute with the code on Windows, [please follow these -instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md). +instructions](https://github.com/Glest/glest-source/blob/master/mk/windows/README.md). For other operating systems, you must [**build and install from -source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +source**](https://github.com/Glest/glest-source/blob/master/BUILD.md) (Later, we'll be providing binary packages). ## Quick Build Guide for Linux @@ -40,31 +40,23 @@ Then run the following command to start the game: ## Links * **[Screenshots](https://github.com/Glest/screenshots)** -* **[Discord](https://discord.gg/WaAaXS7)** +* **[Join us on Discord](https://discord.gg/es3EyBB)** * **[Server list and player stats](http://master.glest.org)** * [FAQ](https://glest.io/docs/faq.html) -* [Compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +* [Compiling](https://github.com/Glest/glest-source/blob/master/BUILD.md) * [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) -* [ChangeLog](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md) +* [ChangeLog](https://github.com/Glest/glest-source/blob/master/ChangeLog.md) * [Detailed information about units in the game](https://glest.io/docs) ### Extra Tech trees, mods, tilesets, scenarios -* [MODS.md](https://github.com/Glest/glest-data/blob/develop/MODS.md) -* [TILESETS.md](https://github.com/Glest/glest-data/blob/develop/TILESETS.md) -* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/develop/SCENARIOS.md) +* [MODS.md](https://github.com/Glest/glest-data/blob/master/MODS.md) +* [TILESETS.md](https://github.com/Glest/glest-data/blob/master/TILESETS.md) +* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/master/SCENARIOS.md) ### Contributing and Testing If you'll be contributing code or changes to data, the procedures for -forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) - -Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) -for extended, important instructions and guidelines for contributing. +forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/master/CONTRIBUTING.md) To run your own headless (dedicated) server, see [the FAQ](https://glest.io/docs/faq.html#headlessserver). - -### Contact Us - -* [Discord](https://discord.gg/WaAaXS7) -* Email: mathusum.mut@gmail.com diff --git a/packaging/Slackbuild/glest/glest.SlackBuild b/packaging/Slackbuild/glest/glest.SlackBuild index 3702bc7ff..f6537ac19 100644 --- a/packaging/Slackbuild/glest/glest.SlackBuild +++ b/packaging/Slackbuild/glest/glest.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for metaglest +# Slackware build script for Glest # Copyright 2011-2017 Larry Hajali # All rights reserved. diff --git a/packaging/Slackbuild/glest/slack-desc b/packaging/Slackbuild/glest/slack-desc index f2b546cbc..4dfa20970 100644 --- a/packaging/Slackbuild/glest/slack-desc +++ b/packaging/Slackbuild/glest/slack-desc @@ -9,7 +9,7 @@ glest: glest (network multi-player real-time strategy game engine) glest: glest: Glest is a network multi-player real-time strategy game engine. -glest: It's shipped with the GlestPack mod, which includes several factions, +glest: It includes several factions, glest: each one consisting of many 3d characters. The factions are loosely glest: based on historical empires with added elements of fantasy, such as glest: mummies produced by Egyptian priests, Indian shamans who summon diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 6a8165cfa..ba2dddca8 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,5 @@ -Glest 1.0 +Glest 2.0 - * First release of Glest after being forked from Glest + * First release of Glest after being renamed from ZetaGlest -- Andy Alt 15.09.2018 2018/09/15 12:44:46 diff --git a/packaging/debian/clean b/packaging/debian/clean index a33a28060..cc230b947 100644 --- a/packaging/debian/clean +++ b/packaging/debian/clean @@ -1,5 +1,3 @@ build/glest_editor build/glest build/glest_g3dviewer -build/glexemel/g2xml -build/glexemel/xml2g diff --git a/packaging/debian/glest.README.Debian b/packaging/debian/glest.README.Debian index 145818004..ae9eaa832 100644 --- a/packaging/debian/glest.README.Debian +++ b/packaging/debian/glest.README.Debian @@ -1,4 +1,4 @@ -ZegaGlest for Debian +Glest for Debian ----------------------- If your glx version is lower than 1.3 set CheckGlCaps=0 in the diff --git a/packaging/debian/watch b/packaging/debian/watch index ca66c0d66..d9619bed5 100644 --- a/packaging/debian/watch +++ b/packaging/debian/watch @@ -1,2 +1,2 @@ -version=0.8 +version=2.0 https://github.com/Glest/glest-source/releases .*/glest-source-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))