From f0488690b79620ccca5af2882fd624e32eb471eb Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Nov 2020 16:53:16 +0100 Subject: [PATCH 1/2] Forgot some author mentions in some files, closes #23 --- COPYING | 2 +- debian/README.debian | 2 +- debian/changelog | 2 +- debian/control | 2 +- docs/deployment.rst | 10 +++++----- setup.py | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/COPYING b/COPYING index e3107c7..1bc08a5 100644 --- a/COPYING +++ b/COPYING @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Squirrel Battle - Copyright (C) 2020 ynerant + Copyright (C) 2020 ÿnérant, eichhornchen, nicomarg, charlse This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/README.debian b/debian/README.debian index 8404efb..6961b22 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -2,4 +2,4 @@ Squirrel Battle Watch out for squirrel's knifes! - -- Yohann D'ANELLO Thu, 19 Nov 2020 03:30:42 +0100 + -- Yohann D'ANELLO Thu, 19 Nov 2020 03:30:42 +0100 diff --git a/debian/changelog b/debian/changelog index d1afdad..536fca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ python3-squirrel-battle (3.14) beta; urgency=low * Initial release. - -- Yohann D'ANELLO Thu, 19 Nov 2020 03:30:42 +0100 + -- Yohann D'ANELLO Thu, 19 Nov 2020 03:30:42 +0100 diff --git a/debian/control b/debian/control index e36e424..fc52e38 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python3-squirrel-battle Section: devel Priority: optional -Maintainer: ynerant +Maintainer: ynerant Build-Depends: debhelper (>=10~), dh-python, python3-all, python3-setuptools Depends: fonts-noto-color-emoji Standards-Version: 4.1.4 diff --git a/docs/deployment.rst b/docs/deployment.rst index 1a4860d..99b15f9 100644 --- a/docs/deployment.rst +++ b/docs/deployment.rst @@ -37,9 +37,9 @@ paquet ainsi que des détails à fournir à PyPI : setup( name="squirrel-battle", version="3.14", - author="ynerant", - author_email="ynerant@crans.org", - description="Watch out for squirrel's knifes!", + author="ÿnérant, eichhornchen, nicomarg, charlse", + author_email="squirrel-battle@crans.org", + description="Watch out for squirrel's knives!", long_description=long_description, long_description_content_type="text/markdown", url="https://gitlab.crans.org/ynerant/squirrel-battle", @@ -156,7 +156,7 @@ du dépôt Git. Le fichier ``PKGBUILD`` dispose de cette structure : .. code:: - # Maintainer: Yohann D'ANELLO + # Maintainer: Yohann D'ANELLO pkgbase=squirrel-battle pkgname=python-squirrel-battle-git @@ -206,7 +206,7 @@ les releases, est plus ou moins similaire : .. code:: - # Maintainer: Yohann D'ANELLO + # Maintainer: Yohann D'ANELLO pkgbase=squirrel-battle pkgname=python-squirrel-battle diff --git a/setup.py b/setup.py index 2cd5038..ef34c31 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ with open("README.md", "r") as f: setup( name="squirrel-battle", version="3.14", - author="ynerant", - author_email="ynerant@crans.org", - description="Watch out for squirrel's knifes!", + author="ÿnérant, eichhornchen, nicomarg, charlse", + author_email="squirrel-battle@crans.org", + description="Watch out for squirrel's knives!", long_description=long_description, long_description_content_type="text/markdown", url="https://gitlab.crans.org/ynerant/squirrel-battle", From 461d176ce42b304d8a805191e1ed5784ae0c78af Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Nov 2020 16:54:47 +0100 Subject: [PATCH 2/2] Build debian packages only on pipelines that run on the master branch --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cb844c..8613258 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,3 +45,5 @@ build-deb: paths: - build/*.deb expire_in: 1 week + only: + - master