Merge branch 'v23.14' into 'master'

Bump to version 23.14

See merge request ynerant/squirrel-battle!76
This commit is contained in:
ynerant 2021-01-10 23:58:31 +01:00
commit 6294f9c07f
10 changed files with 21 additions and 15 deletions

View File

@ -30,7 +30,7 @@ Download one of these two packages on the AUR :
Available on our git repository, has a dependency on fonts-noto-color-emoji (to be found in the official Debian repositories). Available on our git repository, has a dependency on fonts-noto-color-emoji (to be found in the official Debian repositories).
Run ``` Run ```
dpkg -i python3-squirrelbattle_3.14.1_all.deb dpkg -i python3-squirrelbattle_23.14_all.deb
``` after downloading ``` after downloading
In all cases, execute via command line : ```squirrel-battle``` In all cases, execute via command line : ```squirrel-battle```

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
python3-squirrel-battle (23.14) beta; urgency=low
* Big update
-- Yohann D'ANELLO <squirrel-battle@crans.org> Sun, 10 Jan 2021 23:56:42 +0100
python3-squirrel-battle (3.14.1) beta; urgency=low python3-squirrel-battle (3.14.1) beta; urgency=low
* Some graphical improvements. * Some graphical improvements.

View File

@ -3,7 +3,7 @@ Déploiement du projet
.. _PyPI: https://pypi.org/project/squirrel-battle/ .. _PyPI: https://pypi.org/project/squirrel-battle/
.. _AUR: https://aur.archlinux.org/packages/python-squirrel-battle/ .. _AUR: https://aur.archlinux.org/packages/python-squirrel-battle/
.. _Debian: https://gitlab.crans.org/ynerant/squirrel-battle/-/jobs/artifacts/master/raw/build/python3-squirrelbattle_3.14.1_all.deb?job=build-deb .. _Debian: https://gitlab.crans.org/ynerant/squirrel-battle/-/jobs/artifacts/master/raw/build/python3-squirrelbattle_23.14_all.deb?job=build-deb
.. _installation: install.html .. _installation: install.html
À chaque nouvelle version du projet, il est compilé et déployé dans PyPI_, dans À chaque nouvelle version du projet, il est compilé et déployé dans PyPI_, dans
@ -46,7 +46,7 @@ paquet ainsi que des détails à fournir à PyPI :
setup( setup(
name="squirrel-battle", name="squirrel-battle",
version="3.14.1", version="23.14",
author="ÿnérant, eichhornchen, nicomarg, charlse", author="ÿnérant, eichhornchen, nicomarg, charlse",
author_email="squirrel-battle@crans.org", author_email="squirrel-battle@crans.org",
description="Watch out for squirrel's knives!", description="Watch out for squirrel's knives!",
@ -172,7 +172,7 @@ du dépôt Git. Le fichier ``PKGBUILD`` dispose de cette structure :
pkgbase=squirrel-battle pkgbase=squirrel-battle
pkgname=python-squirrel-battle-git pkgname=python-squirrel-battle-git
pkgver=3.14.1 pkgver=23.14
pkgrel=1 pkgrel=1
pkgdesc="Watch out for squirrel's knives!" pkgdesc="Watch out for squirrel's knives!"
arch=('any') arch=('any')
@ -222,7 +222,7 @@ les releases, est plus ou moins similaire :
pkgbase=squirrel-battle pkgbase=squirrel-battle
pkgname=python-squirrel-battle pkgname=python-squirrel-battle
pkgver=3.14.1 pkgver=23.14
pkgrel=1 pkgrel=1
pkgdesc="Watch out for squirrel's knives!" pkgdesc="Watch out for squirrel's knives!"
arch=('any') arch=('any')
@ -232,7 +232,7 @@ les releases, est plus ou moins similaire :
makedepends=('gettext' 'python-setuptools') makedepends=('gettext' 'python-setuptools')
depends=('noto-fonts-emoji') depends=('noto-fonts-emoji')
checkdepends=('python-tox') checkdepends=('python-tox')
source=("https://gitlab.crans.org/ynerant/squirrel-battle/-/archive/v3.14.1/$pkgbase-v$pkgver.tar.gz") source=("https://gitlab.crans.org/ynerant/squirrel-battle/-/archive/v23.14/$pkgbase-v$pkgver.tar.gz")
sha256sums=("6090534d598c0b3a8f5acdb553c12908ba8107d62d08e17747d1dbb397bddef0") sha256sums=("6090534d598c0b3a8f5acdb553c12908ba8107d62d08e17747d1dbb397bddef0")
build() { build() {
@ -317,7 +317,7 @@ On peut ensuite construire le paquet :
dpkg-buildpackage dpkg-buildpackage
mkdir build && cp ../*.deb build/ mkdir build && cp ../*.deb build/
Le paquet sera installé dans ``build/python3-squirrel-battle_3.14.1_all.deb``. Le paquet sera installé dans ``build/python3-squirrel-battle_23.14_all.deb``.
Le paquet Debian_ est construit par l'intégration continue Gitlab et ajouté Le paquet Debian_ est construit par l'intégration continue Gitlab et ajouté
à chaque release. à chaque release.

View File

@ -61,7 +61,7 @@ Le jeu peut être ensuite lancé via la commande ``squirrel-battle``.
Sur Ubuntu/Debian Sur Ubuntu/Debian
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
.. _paquet: https://gitlab.crans.org/ynerant/squirrel-battle/-/jobs/artifacts/master/raw/build/python3-squirrelbattle_3.14.1_all.deb?job=build-deb .. _paquet: https://gitlab.crans.org/ynerant/squirrel-battle/-/jobs/artifacts/master/raw/build/python3-squirrelbattle_23.14_all.deb?job=build-deb
Un paquet_ est généré par l'intégration continue de Gitlab à chaque commit. Un paquet_ est généré par l'intégration continue de Gitlab à chaque commit.
Ils sont également attachés à chaque nouvelle release. Ils sont également attachés à chaque nouvelle release.
@ -73,7 +73,7 @@ Pour installer ce paquet, il suffit de le télécharger et d'appeler ``dpkg`` :
.. code:: bash .. code:: bash
dpkg -i python3-squirrelbattle_3.14.1_all.deb dpkg -i python3-squirrelbattle_23.14_all.deb
Ce paquet inclut un patch pour afficher les émojis écureuil correctement. Ce paquet inclut un patch pour afficher les émojis écureuil correctement.

View File

@ -65,7 +65,7 @@ d'exécuter pour chaque langue ``<LANG>`` :
find squirrelbattle -iname '*.py' | xargs xgettext --from-code utf-8 find squirrelbattle -iname '*.py' | xargs xgettext --from-code utf-8
--add-comments --add-comments
--package-name=squirrelbattle --package-name=squirrelbattle
--package-version=3.14.1 --package-version=23.14
"--copyright-holder=ÿnérant, eichhornchen, nicomarg, charlse" "--copyright-holder=ÿnérant, eichhornchen, nicomarg, charlse"
--msgid-bugs-address=squirrel-battle@crans.org --msgid-bugs-address=squirrel-battle@crans.org
-o squirrelbattle/locale/<LANG>/LC_MESSAGES/squirrelbattle.po -o squirrelbattle/locale/<LANG>/LC_MESSAGES/squirrelbattle.po

View File

@ -22,7 +22,7 @@ for language in ["de", "es", "fr"]:
setup( setup(
name="squirrel-battle", name="squirrel-battle",
version="3.14.1", version="23.14",
author="ÿnérant, eichhornchen, nicomarg, charlse", author="ÿnérant, eichhornchen, nicomarg, charlse",
author_email="squirrel-battle@crans.org", author_email="squirrel-battle@crans.org",
description="Watch out for squirrel's knives!", description="Watch out for squirrel's knives!",

View File

@ -6,7 +6,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: squirrelbattle 3.14.1\n" "Project-Id-Version: squirrelbattle 23.14\n"
"Report-Msgid-Bugs-To: squirrel-battle@crans.org\n" "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
"POT-Creation-Date: 2021-01-10 21:30+0100\n" "POT-Creation-Date: 2021-01-10 21:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

View File

@ -6,7 +6,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: squirrelbattle 3.14.1\n" "Project-Id-Version: squirrelbattle 23.14\n"
"Report-Msgid-Bugs-To: squirrel-battle@crans.org\n" "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
"POT-Creation-Date: 2021-01-10 21:30+0100\n" "POT-Creation-Date: 2021-01-10 21:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

View File

@ -10,7 +10,7 @@ msgstr "{name} prend {amount} points de dégât."
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: squirrelbattle 3.14.1\n" "Project-Id-Version: squirrelbattle 23.14\n"
"Report-Msgid-Bugs-To: squirrel-battle@crans.org\n" "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
"POT-Creation-Date: 2021-01-10 21:30+0100\n" "POT-Creation-Date: 2021-01-10 21:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

View File

@ -65,7 +65,7 @@ class Translator:
args = ["xargs", "xgettext", "--from-code", "utf-8", args = ["xargs", "xgettext", "--from-code", "utf-8",
"--add-comments", "--add-comments",
"--package-name=squirrelbattle", "--package-name=squirrelbattle",
"--package-version=3.14.1", "--package-version=23.14",
"--copyright-holder=ÿnérant, eichhornchen, " "--copyright-holder=ÿnérant, eichhornchen, "
"nicomarg, charlse, ifugao", "nicomarg, charlse, ifugao",
"--msgid-bugs-address=squirrel-battle@crans.org", "--msgid-bugs-address=squirrel-battle@crans.org",