From 258b7703f22045be1b6e9fb74bd3391ed94ed86b Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 28 Jan 2024 05:55:33 -0500 Subject: [PATCH] Simplify SPDX copyright lines to the shortest canonical form... ...because if we leave them longer than 80 chars, reflow is going to mess them up. --- Dockerfile.ci | 2 +- INSTALL.adoc | 2 +- Makefile | 2 +- NEWS.adoc | 2 +- README.adoc | 2 +- actions.c | 2 +- advent.adoc | 2 +- advent.desktop | 2 +- advent.h | 2 +- adventure.yaml | 2 +- cheat.c | 2 +- hints.adoc | 2 +- history.adoc | 2 +- init.c | 2 +- main.c | 2 +- make_dungeon.py | 2 +- make_graph.py | 2 +- misc.c | 2 +- notes.adoc | 2 +- saveresume.c | 2 +- score.c | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index c8f29a1..598687b 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,6 +1,6 @@ # This image is built by the Gitlab CI pipeline to be used in subsequent # pipeline steps. -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause FROM ubuntu diff --git a/INSTALL.adoc b/INSTALL.adoc index b6f5b4b..683e2f0 100644 --- a/INSTALL.adoc +++ b/INSTALL.adoc @@ -1,5 +1,5 @@ = Installing Open Adventure = -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 Installation now requires Python3 due to a security issue diff --git a/Makefile b/Makefile index dfd3ff2..49c909e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for the open-source release of adventure 2.5 -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause # To build with save/resume disabled, pass CFLAGS="-DADVENT_NOSAVE" diff --git a/NEWS.adoc b/NEWS.adoc index b61a477..68aa36c 100644 --- a/NEWS.adoc +++ b/NEWS.adoc @@ -1,5 +1,5 @@ = Open Adventure project news = -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 1.17: 2024-01-02:: diff --git a/README.adoc b/README.adoc index ba67510..6b25f7f 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ = README for Open Adventure = -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 If you are reading this anywhere but at http://www.catb.org/~esr/open-adventure diff --git a/actions.c b/actions.c index 9239b50..ec62447 100644 --- a/actions.c +++ b/actions.c @@ -1,7 +1,7 @@ /* * Actions for the dungeon-running code. * - * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, Copyright 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/advent.adoc b/advent.adoc index 5ce5b3f..9e628e0 100644 --- a/advent.adoc +++ b/advent.adoc @@ -1,6 +1,6 @@ = advent(6) = :doctype: manpage -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 == NAME == diff --git a/advent.desktop b/advent.desktop index 3fe5420..1cc38f8 100644 --- a/advent.desktop +++ b/advent.desktop @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause [Desktop Entry] Type=Application diff --git a/advent.h b/advent.h index e3be917..55518cb 100644 --- a/advent.h +++ b/advent.h @@ -1,7 +1,7 @@ /* * Dungeon types and macros. * - * SPDX-FileCopyrightText: Copyright, 1977, 2005 by Will Crowther and Don Woods, Copyright 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/adventure.yaml b/adventure.yaml index 2069759..31988de 100644 --- a/adventure.yaml +++ b/adventure.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause # # This YAML file gets processed into a collection of data structures and diff --git a/cheat.c b/cheat.c index 9842d5c..279bcd9 100644 --- a/cheat.c +++ b/cheat.c @@ -4,7 +4,7 @@ * savefile(), so we know we're always outputting save files that advent * can import. * - * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, Copyrighy + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/hints.adoc b/hints.adoc index c22c11b..f7e25e1 100644 --- a/hints.adoc +++ b/hints.adoc @@ -1,5 +1,5 @@ = Non-spoiler hints = -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 Say the words you see. They can have interesting effects. diff --git a/history.adoc b/history.adoc index 5384c2c..8ca5da7 100644 --- a/history.adoc +++ b/history.adoc @@ -1,6 +1,6 @@ = A brief history of Colossal Cave Adventure = by Eric S. Raymond -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 Adventure is the fons et origo of all later dungeon-crawling computer diff --git a/init.c b/init.c index 4be4b62..a620b2c 100644 --- a/init.c +++ b/init.c @@ -1,7 +1,7 @@ /* * Initialisation * - * SPDX-FileCopyrightText: Copright 1977, 2005 by Will Crowther and Don Woodsm, Copyright 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woodsm * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/main.c b/main.c index 2e7fdf2..e0fdb69 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, Copyright 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/make_dungeon.py b/make_dungeon.py index 0b8bc53..8d7f719 100755 --- a/make_dungeon.py +++ b/make_dungeon.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause """ This is the open-adventure dungeon generator. It consumes a YAML description of diff --git a/make_graph.py b/make_graph.py index 35dd92f..5a58895 100755 --- a/make_graph.py +++ b/make_graph.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: Copyright Eric S. Raymond +# SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause """\ usage: make_graph.py [-a] [-d] [-m] [-s] [-v] diff --git a/misc.c b/misc.c index 432d5d8..c853237 100644 --- a/misc.c +++ b/misc.c @@ -1,7 +1,7 @@ /* * I/O and support routines. * - * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/notes.adoc b/notes.adoc index cc57885..b970e7c 100644 --- a/notes.adoc +++ b/notes.adoc @@ -1,6 +1,6 @@ = Open Adventure Maintainer's Notes = by Eric S. Raymond -// SPDX-FileCopyrightText: Copyright Eric S. Raymond +// SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 In which we explain what has been done to this code since Don Woods diff --git a/saveresume.c b/saveresume.c index 0d1fbf4..34404c6 100644 --- a/saveresume.c +++ b/saveresume.c @@ -4,7 +4,7 @@ * (ESR) This replaces a bunch of particularly nasty FORTRAN-derived code; * see the history.adoc file in the source distribution for discussion. * - * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, Copyright 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/score.c b/score.c index 9d3d63f..1c9a397 100644 --- a/score.c +++ b/score.c @@ -1,7 +1,7 @@ /* * Scoring and wrap-up. * - * SPDX-FileCopyrightText: Copyright 977, 2005 by Will Crowther and Don Woods, Copyright, 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ #include -- 2.31.1