From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 18:08:18 2019 Received: (at submit) by debbugs.gnu.org; 28 Apr 2019 22:08:18 +0000 Received: from localhost ([127.0.0.1]:37979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKry4-0001Mm-4t for submit@debbugs.gnu.org; Sun, 28 Apr 2019 18:08:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKry1-0001MT-U6 for submit@debbugs.gnu.org; Sun, 28 Apr 2019 18:08:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:36727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKrxw-0004om-M8 for submit@debbugs.gnu.org; Sun, 28 Apr 2019 18:08:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKrxu-0004DR-GM for guix-patches@gnu.org; Sun, 28 Apr 2019 18:08:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BANG_GUAR,BAYES_50, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKrwz-0004Az-9C for guix-patches@gnu.org; Sun, 28 Apr 2019 18:07:11 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:38235) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKrwx-00048T-Rh for guix-patches@gnu.org; Sun, 28 Apr 2019 18:07:09 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id B26FE240003 for ; Sun, 28 Apr 2019 22:07:04 +0000 (UTC) From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH] Rename games to match upstream name project Date: Mon, 29 Apr 2019 00:07:03 +0200 Message-ID: <87r29lg4xk.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.70.183.193 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.6 (-) --=-=-= Content-Type: text/plain Hello, I remember there was some discussion about them, but I don't know what was its conclusion. In any case, for the time being, some games use a "pretty name", e.g., "l-abbaye-des-morts", whereas others do not, e.g., "alex4". I think this should be settled before 1.0 release. Hence, for the sake of consistency, the following patch reverts all games back to their original name. Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Rename-some-games-to-match-upstream-project-name.patch Content-Transfer-Encoding: quoted-printable Content-Description: Rename some games >From 52fa4205c56184782749b5bec244dda6c9023b3e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 23:49:00 +0200 Subject: [PATCH] gnu: Rename some games to match upstream project name. * gnu/packages/games.scm (armagetronad): (cataclysm-dda): (abbaye): (wesnoth): (wesnoth-server): (starfighter): (kiki): (fillets-ng): (crawl): (crawl-tiles): (tome4): (btanks): (battle-tanks): (edgar): Use these as the package definition. (armagetron-advanced): (cataclysm-dark-days-ahead): (l-abbaye-des-morts): (the-battle-for-wesnoth): (the-battle-for-wesnoth-server): (project-starfighter): (kiki-the-nano-bot): (fish-fillets-ng): (dungeon-crawl-stone-soup): (dungeon-crawl-stone-soup-tiles): (tales-of-maj-eyal): (the-legend-of-edgar): Turn these into obsolete aliases. --- gnu/packages/games.scm | 108 ++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index da917e2870..4afc1ccd41 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -288,9 +288,9 @@ Plenty of classic platforming in four nice colors guara= nteed! The game includes a built-in editor so you can design and share your own m= aps.") (license license:gpl2+))) =20 -(define-public armagetron-advanced +(define-public armagetronad (package - (name "armagetron-advanced") + (name "armagetronad") (version "0.2.8.3.4") (source (origin (method url-fetch) @@ -317,8 +317,8 @@ the more advanced player there are new game modes and a= wide variety of physics settings to tweak as well.") (license license:gpl2+))) =20 -(define-public armagetronad - (deprecated-package "armagetronad" armagetron-advanced)) +(define-public armagetron-advanced + (deprecated-package "armagetron-advanced" armagetron)) =20 (define-public bastet (package @@ -384,10 +384,10 @@ Playing bastet can be a painful experience, especiall= y if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.= ") (license license:gpl3+))) =20 -(define-public cataclysm-dark-days-ahead +(define-public cataclysm-dda (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package - (name "cataclysm-dda") + (name "cataclysm-dark-days-ahead") (version "0.D") (source (origin (method git-fetch) @@ -449,8 +449,8 @@ things far stranger and deadlier, and against the other= s like yourself, that want what you have.") (license license:cc-by-sa3.0)))) =20 -(define-public cataclysm-dda - (deprecated-package "cataclysm-dda" cataclysm-dark-days-ahead)) +(define-public cataclysm-dark-days-ahead + (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda)) =20 (define-public cowsay (package @@ -1312,9 +1312,9 @@ can be explored and changed freely.") ;; state "GNU General Public Licence" without specifying a version. (license license:gpl1+))) =20 -(define-public l-abbaye-des-morts +(define-public abbaye (package - (name "l-abbaye-des-morts") + (name "abbaye") (version "2.0.1") (source (origin @@ -1366,8 +1366,8 @@ them, called Jean Raymond, found an old church in whi= ch to hide, not knowing that beneath its ruins lay buried an ancient evil.") (license license:gpl3))) =20 -(define-public abbaye - (deprecated-package "abbaye" l-abbaye-des-morts)) +(define-public l-abbaye-des-morts + (deprecated-package "l-abbaye-des-morts" abbaye)) =20 (define-public angband (package @@ -2215,9 +2215,9 @@ the higher you go. The game features multiplayer, un= limited FPS, smooth floor falling, themeable graphics and sounds, and replays.") (license license:gpl3+))) =20 -(define-public the-battle-for-wesnoth +(define-public wesnoth (package - (name "the-battle-for-wesnoth") + (name "wesnoth") (version "1.14.6") (source (origin (method url-fetch) @@ -2255,13 +2255,13 @@ experience and advance levels, and are carried over= from one scenario to the next campaign.") (license license:gpl2+))) =20 -(define-public wesnoth - (deprecated-package "wesnoth" the-battle-for-wesnoth)) +(define-public the-battle-for-wesnoth + (deprecated-package "the-battle-for-wesnoth" wesnoth)) =20 -(define-public the-battle-for-wesnoth-server +(define-public wesnoth-server (package - (inherit the-battle-for-wesnoth) - (name "the-battle-for-wesnoth-server") + (inherit wesnoth) + (name "wesnoth-server") (inputs `(("boost" ,boost) ("icu4c" ,icu4c) @@ -2274,8 +2274,8 @@ next campaign.") (description "This package contains a dedicated server for @emph{The Battle for Wesnoth}."))) =20 -(define-public wesnoth-server - (deprecated-package "wesnoth-server" the-battle-for-wesnoth-server)) +(define-public the-battle-for-wesnoth-server + (deprecated-package "the-battle-for-wesnoth-server" wesnoth-server)) =20 (define-public gamine (package @@ -3250,9 +3250,9 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) =20 -(define-public project-starfighter +(define-public starfighter (package - (name "project-starfighter") + (name "starfighter") (version "1.7") (source (origin (method url-fetch) @@ -3285,8 +3285,8 @@ in strikes against the evil corporation.") license:cc0 license:public-domain)))) =20 -(define-public starfighter - (deprecated-package "starfighter" project-starfighter)) +(define-public project-starfighter + (deprecated-package "project-starfighter" starfighter)) =20 (define-public chromium-bsu (package @@ -4116,9 +4116,9 @@ over 100 user-created campaigns.") license:cc-by3.0 license:cc-by-sa3.0)))) =20 -(define-public kiki-the-nano-bot +(define-public kiki (package - (name "kiki-the-nano-bot") + (name "kiki") (version "1.0.2") (source (origin (method url-fetch) @@ -4212,8 +4212,8 @@ small robot living in the nano world, repair its make= r.") ;; for a statement from the author. (license license:public-domain))) =20 -(define-public kiki - (deprecated-package "kiki" kiki-the-nano-bot)) +(define-public kiki-the-nano-bot + (deprecated-package "kiki-the-nano-bot" kiki)) =20 (define-public teeworlds (package @@ -4435,9 +4435,9 @@ shapes are arranged in a series of increasingly compl= ex patterns, forming becoming difficult enough to tax even the brightest of minds.") (license license:gpl2+))) =20 -(define-public fish-fillets-ng +(define-public fillets-ng (package - (name "fish-fillets-ng") + (name "fillets-ng") (version "1.0.1") (source (origin (method url-fetch) @@ -4504,12 +4504,12 @@ underwater realm quarrel among themselves or commen= t on the efforts of your fish. The whole game is accompanied by quiet, comforting music.") (license license:gpl2+))) =20 -(define-public fillets-ng - (deprecated-package "fillets-ng" fish-fillets-ng)) +(define-public fish-fillets-ng + (deprecated-package "fish-fillets-ng" fillets-ng)) =20 -(define-public dungeon-crawl-stone-soup +(define-public crawl (package - (name "dungeon-crawl-stone-soup") + (name "crawl") (version "0.23.2") (source (origin @@ -4586,16 +4586,16 @@ monsters in a quest to find the mystifyingly fabulo= us Orb of Zot.") license:zlib license:asl2.0)))) =20 -(define-public crawl - (deprecated-package "crawl" dungeon-crawl-stone-soup)) +(define-public dungeon-crawl-stone-soup + (deprecated-package "dungeon-crawl-stone-soup" crawl)) =20 ;; The linter here claims that patch file names should start with the pack= age ;; name. But, in this case, the patches are inherited from crawl with the ;; "crawl-" prefix instead of "crawl-tiles-". -(define-public dungeon-crawl-stone-soup-tiles +(define-public crawl-tiles (package - (inherit dungeon-crawl-stone-soup) - (name "dungeon-crawl-stone-soup-tiles") + (inherit crawl) + (name "crawl-tiles") (arguments (substitute-keyword-arguments (package-arguments crawl) @@ -4625,8 +4625,8 @@ monsters in a quest to find the mystifyingly fabulous= Orb of Zot.") ("which" ,which))) (synopsis "Graphical roguelike dungeon crawler game"))) =20 -(define-public crawl-tiles - (deprecated-package "crawl-tiles" dungeon-crawl-stone-soup-tiles)) +(define-public dungeon-crawl-stone-soup-tiles + (deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles)) =20 (define-public lugaru (package @@ -4910,9 +4910,9 @@ Crowther & Woods, its original authors, in 1995. It = has been known as \"adventure 2.5\" and \"430-point adventure\".") (license license:bsd-2)))) =20 -(define-public tales-of-maj-eyal +(define-public tome4 (package - (name "tales-of-maj-eyal") + (name "tome4") (version "1.5.10") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source @@ -5033,8 +5033,8 @@ intuitive mouse control, streamlined mechanics and de= ep, challenging combat, Tales of Maj=E2=80=99Eyal offers engaging roguelike gameplay for the 21st = century.") (license license:gpl3+))) =20 -(define-public tome4 - (deprecated-package "tome4" tales-of-maj-eyal)) +(define-public tales-of-maj-eyal + (deprecated-package "tales-of-maj-eyal" tome4)) =20 (define-public quakespasm (package @@ -6273,9 +6273,9 @@ to download and install them in @file{$HOME/.stepmani= a-X.Y/Songs} directory.") (home-page "https://www.stepmania.com") (license license:expat))) =20 -(define-public battle-tanks +(define-public btanks (package - (name "battle-tanks") + (name "btanks") (version "0.9.8083") (source (origin @@ -6359,8 +6359,8 @@ and cooperative.") ;; developers. (license (list license:gpl2+ license:lgpl2.1+)))) =20 -(define-public btanks - (deprecated-package "btanks" battle-tanks)) +(define-public battle-tanks + (deprecated-package "battle-tanks" btanks)) =20 (define-public slingshot (package @@ -6516,9 +6516,9 @@ as a unique casting system where the player draws run= es in real time to effect the desired spell.") (license license:gpl3+))) =20 -(define-public the-legend-of-edgar +(define-public edgar (package - (name "the-legend-of-edgar") + (name "edgar") (version "1.31") (source (origin @@ -6561,8 +6561,8 @@ a fortress beyond the forbidden swamp.") (home-page "https://www.parallelrealities.co.uk/games/edgar/") (license license:gpl2+))) =20 -(define-public edgar - (deprecated-package "edgar" the-legend-of-edgar)) +(define-public the-legend-of-edgar + (deprecated-package "the-legend-of-edgar" edgar)) =20 (define-public openclonk (package --=20 2.21.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 19:02:53 2019 Received: (at submit) by debbugs.gnu.org; 28 Apr 2019 23:02:53 +0000 Received: from localhost ([127.0.0.1]:38031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKsou-0004h5-Io for submit@debbugs.gnu.org; Sun, 28 Apr 2019 19:02:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKsop-0004gp-RU for submit@debbugs.gnu.org; Sun, 28 Apr 2019 19:02:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:55721) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKsok-0003UB-JQ for submit@debbugs.gnu.org; Sun, 28 Apr 2019 19:02:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKsoi-00077V-E2 for guix-patches@gnu.org; Sun, 28 Apr 2019 19:02:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=BANG_GUAR,BAYES_50 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKsog-0003QJ-Fb for guix-patches@gnu.org; Sun, 28 Apr 2019 19:02:40 -0400 Received: from tobias.gr ([2001:470:7405::1]:54016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKsof-0003Hf-ST for guix-patches@gnu.org; Sun, 28 Apr 2019 19:02:38 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id df7b7afd; Sun, 28 Apr 2019 23:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=N9AnIqNIpxbbMQxY097GkU NQIY7VTz1oAKxI7+alZaM=; b=iG6ZH3Rg1xwlMca60dqy9lA2nSVCiHd9E8nPAI ymhrnwU31jusJ8uMKVtXvREC2bpCIr+arzMzpmoYVJrKi6AUUyeNDSIPRQ0jdgzH SyaRfIZ76cohgB4tzp1a8cDykjQBt7vxE5GvNT1YPPra3fKF+AQT0oKR21P8LLrw WsqORqVRalTEPPEc9p/GYvZE+p8Du9QHIfkMhTw4YJJrLVSByj1EAFozjhwpQZaH QpZ8mmVx0WekP2KJLurgXh6Pln3zdFOd18vJULMKFl1D+EbWnY9UFePI2v90l0LS oBLSRV6j+Yrm7BH5blI9/pM7lsqQp7LXiuBAD5T7aHTG2cNA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id aa5cdee0 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 28 Apr 2019 23:02:32 +0000 (UTC) From: Tobias Geerinckx-Rice To: guix-patches@gnu.org Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project References: <87r29lg4xk.fsf@nicolasgoaziou.fr> In-reply-to: <87r29lg4xk.fsf@nicolasgoaziou.fr> Date: Mon, 29 Apr 2019 01:02:30 +0200 Message-ID: <87lfztka2h.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:470:7405::1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: submit Cc: 35482@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.4 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; format=flowed Nicolas, Nicolas Goaziou wrote: > I think this should be settled before 1.0 release. I agree 100%. > Hence, for the sake of consistency, the following patch reverts > all > games back to their original name. I don't have time to build all affected games before bed time (and I'd like to), but attached is a revised patch that fixes 2 evaluation failures: diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4afc1ccd41..8400849be2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -318,7 +318,7 @@ physics settings to tweak as well.") (license license:gpl2+))) (define-public armagetron-advanced - (deprecated-package "armagetron-advanced" armagetron)) + (deprecated-package "armagetron-advanced" armagetronad)) (define-public bastet (package @@ -387,7 +387,7 @@ canyons and wait for the long I-shaped block to clear four rows at a time.") (define-public cataclysm-dda (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package - (name "cataclysm-dark-days-ahead") + (name "cataclysm-dda") (version "0.D") (source (origin (method git-fetch) Thank you! T G-R --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Rename-some-games-to-match-upstream-project-name.patch Content-Transfer-Encoding: quoted-printable From=20c46d2675d9e1407ee44d859e0a88cd994b1fe6eb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 23:49:00 +0200 Subject: [PATCH] gnu: Rename some games to match upstream project name. * gnu/packages/games.scm (armagetronad): (cataclysm-dda): (abbaye): (wesnoth): (wesnoth-server): (starfighter): (kiki): (fillets-ng): (crawl): (crawl-tiles): (tome4): (btanks): (battle-tanks): (edgar): Use these as the package definition. (armagetron-advanced): (cataclysm-dark-days-ahead): (l-abbaye-des-morts): (the-battle-for-wesnoth): (the-battle-for-wesnoth-server): (project-starfighter): (kiki-the-nano-bot): (fish-fillets-ng): (dungeon-crawl-stone-soup): (dungeon-crawl-stone-soup-tiles): (tales-of-maj-eyal): (the-legend-of-edgar): Turn these into obsolete aliases. =2D-- gnu/packages/games.scm | 106 ++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index da917e2870..8400849be2 100644 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -288,9 +288,9 @@ Plenty of classic platforming in four nice colors guara= nteed! The game includes a built-in editor so you can design and share your own m= aps.") (license license:gpl2+))) =20 =2D(define-public armagetron-advanced +(define-public armagetronad (package =2D (name "armagetron-advanced") + (name "armagetronad") (version "0.2.8.3.4") (source (origin (method url-fetch) @@ -317,8 +317,8 @@ the more advanced player there are new game modes and a= wide variety of physics settings to tweak as well.") (license license:gpl2+))) =20 =2D(define-public armagetronad =2D (deprecated-package "armagetronad" armagetron-advanced)) +(define-public armagetron-advanced + (deprecated-package "armagetron-advanced" armagetronad)) =20 (define-public bastet (package @@ -384,7 +384,7 @@ Playing bastet can be a painful experience, especially = if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.= ") (license license:gpl3+))) =20 =2D(define-public cataclysm-dark-days-ahead +(define-public cataclysm-dda (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package (name "cataclysm-dda") @@ -449,8 +449,8 @@ things far stranger and deadlier, and against the other= s like yourself, that want what you have.") (license license:cc-by-sa3.0)))) =20 =2D(define-public cataclysm-dda =2D (deprecated-package "cataclysm-dda" cataclysm-dark-days-ahead)) +(define-public cataclysm-dark-days-ahead + (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda)) =20 (define-public cowsay (package @@ -1312,9 +1312,9 @@ can be explored and changed freely.") ;; state "GNU General Public Licence" without specifying a version. (license license:gpl1+))) =20 =2D(define-public l-abbaye-des-morts +(define-public abbaye (package =2D (name "l-abbaye-des-morts") + (name "abbaye") (version "2.0.1") (source (origin @@ -1366,8 +1366,8 @@ them, called Jean Raymond, found an old church in whi= ch to hide, not knowing that beneath its ruins lay buried an ancient evil.") (license license:gpl3))) =20 =2D(define-public abbaye =2D (deprecated-package "abbaye" l-abbaye-des-morts)) +(define-public l-abbaye-des-morts + (deprecated-package "l-abbaye-des-morts" abbaye)) =20 (define-public angband (package @@ -2215,9 +2215,9 @@ the higher you go. The game features multiplayer, un= limited FPS, smooth floor falling, themeable graphics and sounds, and replays.") (license license:gpl3+))) =20 =2D(define-public the-battle-for-wesnoth +(define-public wesnoth (package =2D (name "the-battle-for-wesnoth") + (name "wesnoth") (version "1.14.6") (source (origin (method url-fetch) @@ -2255,13 +2255,13 @@ experience and advance levels, and are carried over= from one scenario to the next campaign.") (license license:gpl2+))) =20 =2D(define-public wesnoth =2D (deprecated-package "wesnoth" the-battle-for-wesnoth)) +(define-public the-battle-for-wesnoth + (deprecated-package "the-battle-for-wesnoth" wesnoth)) =20 =2D(define-public the-battle-for-wesnoth-server +(define-public wesnoth-server (package =2D (inherit the-battle-for-wesnoth) =2D (name "the-battle-for-wesnoth-server") + (inherit wesnoth) + (name "wesnoth-server") (inputs `(("boost" ,boost) ("icu4c" ,icu4c) @@ -2274,8 +2274,8 @@ next campaign.") (description "This package contains a dedicated server for @emph{The Battle for Wesnoth}."))) =20 =2D(define-public wesnoth-server =2D (deprecated-package "wesnoth-server" the-battle-for-wesnoth-server)) +(define-public the-battle-for-wesnoth-server + (deprecated-package "the-battle-for-wesnoth-server" wesnoth-server)) =20 (define-public gamine (package @@ -3250,9 +3250,9 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) =20 =2D(define-public project-starfighter +(define-public starfighter (package =2D (name "project-starfighter") + (name "starfighter") (version "1.7") (source (origin (method url-fetch) @@ -3285,8 +3285,8 @@ in strikes against the evil corporation.") license:cc0 license:public-domain)))) =20 =2D(define-public starfighter =2D (deprecated-package "starfighter" project-starfighter)) +(define-public project-starfighter + (deprecated-package "project-starfighter" starfighter)) =20 (define-public chromium-bsu (package @@ -4116,9 +4116,9 @@ over 100 user-created campaigns.") license:cc-by3.0 license:cc-by-sa3.0)))) =20 =2D(define-public kiki-the-nano-bot +(define-public kiki (package =2D (name "kiki-the-nano-bot") + (name "kiki") (version "1.0.2") (source (origin (method url-fetch) @@ -4212,8 +4212,8 @@ small robot living in the nano world, repair its make= r.") ;; for a statement from the author. (license license:public-domain))) =20 =2D(define-public kiki =2D (deprecated-package "kiki" kiki-the-nano-bot)) +(define-public kiki-the-nano-bot + (deprecated-package "kiki-the-nano-bot" kiki)) =20 (define-public teeworlds (package @@ -4435,9 +4435,9 @@ shapes are arranged in a series of increasingly compl= ex patterns, forming becoming difficult enough to tax even the brightest of minds.") (license license:gpl2+))) =20 =2D(define-public fish-fillets-ng +(define-public fillets-ng (package =2D (name "fish-fillets-ng") + (name "fillets-ng") (version "1.0.1") (source (origin (method url-fetch) @@ -4504,12 +4504,12 @@ underwater realm quarrel among themselves or commen= t on the efforts of your fish. The whole game is accompanied by quiet, comforting music.") (license license:gpl2+))) =20 =2D(define-public fillets-ng =2D (deprecated-package "fillets-ng" fish-fillets-ng)) +(define-public fish-fillets-ng + (deprecated-package "fish-fillets-ng" fillets-ng)) =20 =2D(define-public dungeon-crawl-stone-soup +(define-public crawl (package =2D (name "dungeon-crawl-stone-soup") + (name "crawl") (version "0.23.2") (source (origin @@ -4586,16 +4586,16 @@ monsters in a quest to find the mystifyingly fabulo= us Orb of Zot.") license:zlib license:asl2.0)))) =20 =2D(define-public crawl =2D (deprecated-package "crawl" dungeon-crawl-stone-soup)) +(define-public dungeon-crawl-stone-soup + (deprecated-package "dungeon-crawl-stone-soup" crawl)) =20 ;; The linter here claims that patch file names should start with the pack= age ;; name. But, in this case, the patches are inherited from crawl with the ;; "crawl-" prefix instead of "crawl-tiles-". =2D(define-public dungeon-crawl-stone-soup-tiles +(define-public crawl-tiles (package =2D (inherit dungeon-crawl-stone-soup) =2D (name "dungeon-crawl-stone-soup-tiles") + (inherit crawl) + (name "crawl-tiles") (arguments (substitute-keyword-arguments (package-arguments crawl) @@ -4625,8 +4625,8 @@ monsters in a quest to find the mystifyingly fabulous= Orb of Zot.") ("which" ,which))) (synopsis "Graphical roguelike dungeon crawler game"))) =20 =2D(define-public crawl-tiles =2D (deprecated-package "crawl-tiles" dungeon-crawl-stone-soup-tiles)) +(define-public dungeon-crawl-stone-soup-tiles + (deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles)) =20 (define-public lugaru (package @@ -4910,9 +4910,9 @@ Crowther & Woods, its original authors, in 1995. It = has been known as \"adventure 2.5\" and \"430-point adventure\".") (license license:bsd-2)))) =20 =2D(define-public tales-of-maj-eyal +(define-public tome4 (package =2D (name "tales-of-maj-eyal") + (name "tome4") (version "1.5.10") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source @@ -5033,8 +5033,8 @@ intuitive mouse control, streamlined mechanics and de= ep, challenging combat, Tales of Maj=E2=80=99Eyal offers engaging roguelike gameplay for the 21st = century.") (license license:gpl3+))) =20 =2D(define-public tome4 =2D (deprecated-package "tome4" tales-of-maj-eyal)) +(define-public tales-of-maj-eyal + (deprecated-package "tales-of-maj-eyal" tome4)) =20 (define-public quakespasm (package @@ -6273,9 +6273,9 @@ to download and install them in @file{$HOME/.stepmani= a-X.Y/Songs} directory.") (home-page "https://www.stepmania.com") (license license:expat))) =20 =2D(define-public battle-tanks +(define-public btanks (package =2D (name "battle-tanks") + (name "btanks") (version "0.9.8083") (source (origin @@ -6359,8 +6359,8 @@ and cooperative.") ;; developers. (license (list license:gpl2+ license:lgpl2.1+)))) =20 =2D(define-public btanks =2D (deprecated-package "btanks" battle-tanks)) +(define-public battle-tanks + (deprecated-package "battle-tanks" btanks)) =20 (define-public slingshot (package @@ -6516,9 +6516,9 @@ as a unique casting system where the player draws run= es in real time to effect the desired spell.") (license license:gpl3+))) =20 =2D(define-public the-legend-of-edgar +(define-public edgar (package =2D (name "the-legend-of-edgar") + (name "edgar") (version "1.31") (source (origin @@ -6561,8 +6561,8 @@ a fortress beyond the forbidden swamp.") (home-page "https://www.parallelrealities.co.uk/games/edgar/") (license license:gpl2+))) =20 =2D(define-public edgar =2D (deprecated-package "edgar" the-legend-of-edgar)) +(define-public the-legend-of-edgar + (deprecated-package "the-legend-of-edgar" edgar)) =20 (define-public openclonk (package =2D-=20 2.21.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXMYxBwAKCRANsP+IT1Vt eazxAQD65sxJhXivvxgDamT25apmxrmya/YL9pAyor/UsKKzkwEAym+XQQ1fv1S/ Ta0RBnX+G1nwrSOJarfZwfHwMeEI+AI= =ZBDo -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 03:30:31 2019 Received: (at 35482) by debbugs.gnu.org; 29 Apr 2019 07:30:31 +0000 Received: from localhost ([127.0.0.1]:38304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hL0kA-00005d-U5 for submit@debbugs.gnu.org; Mon, 29 Apr 2019 03:30:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hL0k9-00005S-Tg for 35482@debbugs.gnu.org; Mon, 29 Apr 2019 03:30:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL0k1-0008Nv-Rz; Mon, 29 Apr 2019 03:30:22 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=48228 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hL0k1-0006lv-9j; Mon, 29 Apr 2019 03:30:21 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project References: <87r29lg4xk.fsf@nicolasgoaziou.fr> Date: Mon, 29 Apr 2019 09:30:19 +0200 In-Reply-To: <87r29lg4xk.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Mon, 29 Apr 2019 00:07:03 +0200") Message-ID: <87muk9jmk4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 35482 Cc: 35482@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, Nicolas Goaziou skribis: > I remember there was some discussion about them, but I don't know what > was its conclusion.=20 Several people were in favor of reverting the name changes. > In any case, for the time being, some games use a "pretty name", e.g., > "l-abbaye-des-morts", whereas others do not, e.g., "alex4". I think this > should be settled before 1.0 release. Hence, for the sake of > consistency, the following patch reverts all games back to their > original name. I=E2=80=99m all for it, thanks for taking the time to do it. (That=E2=80= =99s another reason why this big-rename patch should have gone through review: once committed, it remained, even though consensus was reached to revert it; not a great situation!) >>>From 52fa4205c56184782749b5bec244dda6c9023b3e Mon Sep 17 00:00:00 2001 > From: Nicolas Goaziou > Date: Sun, 28 Apr 2019 23:49:00 +0200 > Subject: [PATCH] gnu: Rename some games to match upstream project name. > > * gnu/packages/games.scm (armagetronad): > (cataclysm-dda): > (abbaye): > (wesnoth): > (wesnoth-server): > (starfighter): > (kiki): > (fillets-ng): > (crawl): > (crawl-tiles): > (tome4): > (btanks): > (battle-tanks): > (edgar): Use these as the package definition. > (armagetron-advanced): > (cataclysm-dark-days-ahead): > (l-abbaye-des-morts): > (the-battle-for-wesnoth): > (the-battle-for-wesnoth-server): > (project-starfighter): > (kiki-the-nano-bot): > (fish-fillets-ng): > (dungeon-crawl-stone-soup): > (dungeon-crawl-stone-soup-tiles): > (tales-of-maj-eyal): > (the-legend-of-edgar): Turn these into obsolete aliases. Please add a line like =E2=80=9CThis reverts renames made by commit XYZ.=E2= =80=9D Just double-check that there are no unbound variables or anything like that, after applying Tobias=E2=80=99 changes, and then go for it! Thank you, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 20:13:38 2019 Received: (at 35482-done) by debbugs.gnu.org; 30 Apr 2019 00:13:38 +0000 Received: from localhost ([127.0.0.1]:40158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hLGOw-0006Ny-59 for submit@debbugs.gnu.org; Mon, 29 Apr 2019 20:13:38 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:52323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hLGOu-0006Np-0B for 35482-done@debbugs.gnu.org; Mon, 29 Apr 2019 20:13:36 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 0B9DAFF808; Tue, 30 Apr 2019 00:13:33 +0000 (UTC) From: Nicolas Goaziou To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project References: <87r29lg4xk.fsf@nicolasgoaziou.fr> <87muk9jmk4.fsf@gnu.org> Date: Tue, 30 Apr 2019 02:13:33 +0200 In-Reply-To: <87muk9jmk4.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Mon, 29 Apr 2019 09:30:19 +0200") Message-ID: <8736m073ki.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35482-done Cc: 35482-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Ludovic Court=C3=A8s writes: > Please add a line like =E2=80=9CThis reverts renames made by commit XYZ.= =E2=80=9D OK. > Just double-check that there are no unbound variables or anything like > that, after applying Tobias=E2=80=99 changes, and then go for it! Done in 649220adae24cf0eaffe4f4c5f76ada8b84b17bb. Thank you. Regards, --=20 Nicolas Goaziou From unknown Sat Jun 21 03:30:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 28 May 2019 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator