GNU bug report logs - #35482
[PATCH] Rename games to match upstream name project

Previous Next

Package: guix-patches;

Reported by: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Date: Sun, 28 Apr 2019 22:09:02 UTC

Severity: normal

Tags: patch

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 35482 in the body.
You can then email your comments to 35482 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#35482; Package guix-patches. (Sun, 28 Apr 2019 22:09:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 28 Apr 2019 22:09:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] Rename games to match upstream name project
Date: Mon, 29 Apr 2019 00:07:03 +0200

[Message part 1 (text/plain, inline)]
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

[0001-gnu-Rename-some-games-to-match-upstream-project-name.patch (text/x-diff, inline)]
From 52fa4205c56184782749b5bec244dda6c9023b3e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
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 guaranteed!
 The game includes a built-in editor so you can design and share your own maps.")
     (license license:gpl2+)))
 
-(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+)))
 
-(define-public armagetronad
-  (deprecated-package "armagetronad" armagetron-advanced))
+(define-public armagetron-advanced
+  (deprecated-package "armagetron-advanced" armagetron))
 
 (define-public bastet
   (package
@@ -384,10 +384,10 @@ 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+)))
 
-(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 others like yourself, that
 want what you have.")
       (license license:cc-by-sa3.0))))
 
-(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))
 
 (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+)))
 
-(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 which to hide, not knowing
 that beneath its ruins lay buried an ancient evil.")
     (license license:gpl3)))
 
-(define-public abbaye
-  (deprecated-package "abbaye" l-abbaye-des-morts))
+(define-public l-abbaye-des-morts
+  (deprecated-package "l-abbaye-des-morts" abbaye))
 
 (define-public angband
   (package
@@ -2215,9 +2215,9 @@ the higher you go.  The game features multiplayer, unlimited FPS, smooth floor
 falling, themeable graphics and sounds, and replays.")
     (license license:gpl3+)))
 
-(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+)))
 
-(define-public wesnoth
-  (deprecated-package "wesnoth" the-battle-for-wesnoth))
+(define-public the-battle-for-wesnoth
+  (deprecated-package "the-battle-for-wesnoth" wesnoth))
 
-(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}.")))
 
-(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))
 
 (define-public gamine
   (package
@@ -3250,9 +3250,9 @@ tactics.")
                    license:gpl2+
                    license:lgpl2.1+))))
 
-(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))))
 
-(define-public starfighter
-  (deprecated-package "starfighter" project-starfighter))
+(define-public project-starfighter
+  (deprecated-package "project-starfighter" starfighter))
 
 (define-public chromium-bsu
   (package
@@ -4116,9 +4116,9 @@ over 100 user-created campaigns.")
                    license:cc-by3.0
                    license:cc-by-sa3.0))))
 
-(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 maker.")
     ;; for a statement from the author.
     (license license:public-domain)))
 
-(define-public kiki
-  (deprecated-package "kiki" kiki-the-nano-bot))
+(define-public kiki-the-nano-bot
+  (deprecated-package "kiki-the-nano-bot" kiki))
 
 (define-public teeworlds
   (package
@@ -4435,9 +4435,9 @@ shapes are arranged in a series of increasingly complex patterns, forming
  becoming difficult enough to tax even the brightest of minds.")
     (license license:gpl2+)))
 
-(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 comment on the efforts of your
 fish.  The whole game is accompanied by quiet, comforting music.")
     (license license:gpl2+)))
 
-(define-public fillets-ng
-  (deprecated-package "fillets-ng" fish-fillets-ng))
+(define-public fish-fillets-ng
+  (deprecated-package "fish-fillets-ng" fillets-ng))
 
-(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 fabulous Orb of Zot.")
                    license:zlib
                    license:asl2.0))))
 
-(define-public crawl
-  (deprecated-package "crawl" dungeon-crawl-stone-soup))
+(define-public dungeon-crawl-stone-soup
+  (deprecated-package "dungeon-crawl-stone-soup" crawl))
 
 ;; The linter here claims that patch file names should start with the package
 ;; 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")))
 
-(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))
 
 (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))))
 
-(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 deep, challenging combat,
 Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.")
     (license license:gpl3+)))
 
-(define-public tome4
-  (deprecated-package "tome4" tales-of-maj-eyal))
+(define-public tales-of-maj-eyal
+  (deprecated-package "tales-of-maj-eyal" tome4))
 
 (define-public quakespasm
   (package
@@ -6273,9 +6273,9 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
     (home-page "https://www.stepmania.com")
     (license license:expat)))
 
-(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+))))
 
-(define-public btanks
-  (deprecated-package "btanks" battle-tanks))
+(define-public battle-tanks
+  (deprecated-package "battle-tanks" btanks))
 
 (define-public slingshot
   (package
@@ -6516,9 +6516,9 @@ as a unique casting system where the player draws runes in real time to effect
 the desired spell.")
     (license license:gpl3+)))
 
-(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+)))
 
-(define-public edgar
-  (deprecated-package "edgar" the-legend-of-edgar))
+(define-public the-legend-of-edgar
+  (deprecated-package "the-legend-of-edgar" edgar))
 
 (define-public openclonk
   (package
-- 
2.21.0
Information forwarded to guix-patches <at> gnu.org:
bug#35482; Package guix-patches. (Sun, 28 Apr 2019 23:03:02 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: guix-patches <at> gnu.org
Cc: 35482 <at> debbugs.gnu.org
Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project
Date: Mon, 29 Apr 2019 01:02:30 +0200

[Message part 1 (text/plain, inline)]
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


[0001-gnu-Rename-some-games-to-match-upstream-project-name.patch (text/x-patch, inline)]
From c46d2675d9e1407ee44d859e0a88cd994b1fe6eb Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
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 | 106 ++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index da917e2870..8400849be2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -288,9 +288,9 @@ Plenty of classic platforming in four nice colors guaranteed!
 The game includes a built-in editor so you can design and share your own maps.")
     (license license:gpl2+)))
 
-(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+)))
 
-(define-public armagetronad
-  (deprecated-package "armagetronad" armagetron-advanced))
+(define-public armagetron-advanced
+  (deprecated-package "armagetron-advanced" armagetronad))
 
 (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+)))
 
-(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 others like yourself, that
 want what you have.")
       (license license:cc-by-sa3.0))))
 
-(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))
 
 (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+)))
 
-(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 which to hide, not knowing
 that beneath its ruins lay buried an ancient evil.")
     (license license:gpl3)))
 
-(define-public abbaye
-  (deprecated-package "abbaye" l-abbaye-des-morts))
+(define-public l-abbaye-des-morts
+  (deprecated-package "l-abbaye-des-morts" abbaye))
 
 (define-public angband
   (package
@@ -2215,9 +2215,9 @@ the higher you go.  The game features multiplayer, unlimited FPS, smooth floor
 falling, themeable graphics and sounds, and replays.")
     (license license:gpl3+)))
 
-(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+)))
 
-(define-public wesnoth
-  (deprecated-package "wesnoth" the-battle-for-wesnoth))
+(define-public the-battle-for-wesnoth
+  (deprecated-package "the-battle-for-wesnoth" wesnoth))
 
-(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}.")))
 
-(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))
 
 (define-public gamine
   (package
@@ -3250,9 +3250,9 @@ tactics.")
                    license:gpl2+
                    license:lgpl2.1+))))
 
-(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))))
 
-(define-public starfighter
-  (deprecated-package "starfighter" project-starfighter))
+(define-public project-starfighter
+  (deprecated-package "project-starfighter" starfighter))
 
 (define-public chromium-bsu
   (package
@@ -4116,9 +4116,9 @@ over 100 user-created campaigns.")
                    license:cc-by3.0
                    license:cc-by-sa3.0))))
 
-(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 maker.")
     ;; for a statement from the author.
     (license license:public-domain)))
 
-(define-public kiki
-  (deprecated-package "kiki" kiki-the-nano-bot))
+(define-public kiki-the-nano-bot
+  (deprecated-package "kiki-the-nano-bot" kiki))
 
 (define-public teeworlds
   (package
@@ -4435,9 +4435,9 @@ shapes are arranged in a series of increasingly complex patterns, forming
  becoming difficult enough to tax even the brightest of minds.")
     (license license:gpl2+)))
 
-(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 comment on the efforts of your
 fish.  The whole game is accompanied by quiet, comforting music.")
     (license license:gpl2+)))
 
-(define-public fillets-ng
-  (deprecated-package "fillets-ng" fish-fillets-ng))
+(define-public fish-fillets-ng
+  (deprecated-package "fish-fillets-ng" fillets-ng))
 
-(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 fabulous Orb of Zot.")
                    license:zlib
                    license:asl2.0))))
 
-(define-public crawl
-  (deprecated-package "crawl" dungeon-crawl-stone-soup))
+(define-public dungeon-crawl-stone-soup
+  (deprecated-package "dungeon-crawl-stone-soup" crawl))
 
 ;; The linter here claims that patch file names should start with the package
 ;; 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")))
 
-(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))
 
 (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))))
 
-(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 deep, challenging combat,
 Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.")
     (license license:gpl3+)))
 
-(define-public tome4
-  (deprecated-package "tome4" tales-of-maj-eyal))
+(define-public tales-of-maj-eyal
+  (deprecated-package "tales-of-maj-eyal" tome4))
 
 (define-public quakespasm
   (package
@@ -6273,9 +6273,9 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
     (home-page "https://www.stepmania.com")
     (license license:expat)))
 
-(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+))))
 
-(define-public btanks
-  (deprecated-package "btanks" battle-tanks))
+(define-public battle-tanks
+  (deprecated-package "battle-tanks" btanks))
 
 (define-public slingshot
   (package
@@ -6516,9 +6516,9 @@ as a unique casting system where the player draws runes in real time to effect
 the desired spell.")
     (license license:gpl3+)))
 
-(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+)))
 
-(define-public edgar
-  (deprecated-package "edgar" the-legend-of-edgar))
+(define-public the-legend-of-edgar
+  (deprecated-package "the-legend-of-edgar" edgar))
 
 (define-public openclonk
   (package
-- 
2.21.0


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#35482; Package guix-patches. (Sun, 28 Apr 2019 23:03:02 GMT) Full text and rfc822 format available.
Information forwarded to guix-patches <at> gnu.org:
bug#35482; Package guix-patches. (Mon, 29 Apr 2019 07:31:02 GMT) Full text and rfc822 format available.

Message #14 received at 35482 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 35482 <at> debbugs.gnu.org
Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project
Date: Mon, 29 Apr 2019 09:30:19 +0200

Hi Nicolas,

Nicolas Goaziou <mail <at> nicolasgoaziou.fr> skribis:

> I remember there was some discussion about them, but I don't know what
> was its conclusion. 

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’m all for it, thanks for taking the time to do it.  (That’s 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 <mail <at> nicolasgoaziou.fr>
> 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 “This reverts renames made by commit XYZ.”

Just double-check that there are no unbound variables or anything like
that, after applying Tobias’ changes, and then go for it!

Thank you,
Ludo’.
Reply sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
You have taken responsibility. (Tue, 30 Apr 2019 00:14:01 GMT) Full text and rfc822 format available.
Notification sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
bug acknowledged by developer. (Tue, 30 Apr 2019 00:14:02 GMT) Full text and rfc822 format available.

Message #19 received at 35482-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 35482-done <at> debbugs.gnu.org
Subject: Re: [bug#35482] [PATCH] Rename games to match upstream name project
Date: Tue, 30 Apr 2019 02:13:33 +0200

Hello,

Ludovic Courtès <ludo <at> gnu.org> writes:

> Please add a line like “This reverts renames made by commit XYZ.”

OK.

> Just double-check that there are no unbound variables or anything like
> that, after applying Tobias’ changes, and then go for it!

Done in 649220adae24cf0eaffe4f4c5f76ada8b84b17bb. Thank you.

Regards,

-- 
Nicolas Goaziou
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 28 May 2019 11:24:06 GMT) Full text and rfc822 format available.
This bug report was last modified 4 years and 333 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.