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.

diff --git a/Dockerfile.ci b/Dockerfile.ci
index c8f29a187ab00afe44595bc710f421769a5d75f9..598687b9dd130f496b12645e1d43056b70f4271d 100644 (file)
--- 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 <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # SPDX-License-Identifier: BSD-2-Clause
 
 FROM ubuntu

diff --git a/INSTALL.adoc b/INSTALL.adoc
index b6f5b4b763750e6bf566c1466f8d6c35efe3f1d6..683e2f0b8ab2847f53caa37c7b597f5051f89fb1 100644 (file)
--- a/INSTALL.adoc
+++ b/INSTALL.adoc
@@ -1,5 +1,5 @@
 = Installing Open Adventure =
-// SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // SPDX-License-Identifier: CC-BY-4.0
 
 Installation now requires Python3 due to a security issue

diff --git a/Makefile b/Makefile
index dfd3ff29878d73bc43445d104f8ae0e04e0d9a80..49c909ef9fde49a559fbcb0c87839f35c004c730 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the open-source release of adventure 2.5
 
-# SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # 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 b61a47710dc8df429fbd19ab127ab9c24959aaa1..68aa36c284d2e3e83201ecbad224a7a435a4c1c9 100644 (file)
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -1,5 +1,5 @@
 = Open Adventure project news =
-// SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // SPDX-License-Identifier: CC-BY-4.0
 
 1.17: 2024-01-02::

diff --git a/README.adoc b/README.adoc
index ba67510c2de8ecabd1eb0e22509b840e0c551573..6b25f7fe9b92dbc4520ebeaf2e07ef108f770aec 100644 (file)
--- a/README.adoc
+++ b/README.adoc
@@ -1,5 +1,5 @@
 = README for Open Adventure =
-// SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // 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 9239b50aaf0149c3f86620dc5a6b7708a4bb7d4c..ec62447145edbe228892fb5d9ce6421ad97c69d7 100644 (file)
--- 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 5ce5b3fdc1600ea1f0fd53cbe0d592e5754669ef..9e628e008f2c3badb7bc820c330e114787b907fe 100644 (file)
--- a/advent.adoc
+++ b/advent.adoc
@@ -1,6 +1,6 @@
 = advent(6) =
 :doctype: manpage
-// SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // SPDX-License-Identifier: CC-BY-4.0
 
 == NAME ==

diff --git a/advent.desktop b/advent.desktop
index 3fe5420d28fde0ccdfd54f5989e9f6e024e436bf..1cc38f8b6700c9922196e9f37063f01c3999bb7e 100644 (file)
--- a/advent.desktop
+++ b/advent.desktop
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # SPDX-License-Identifier: BSD-2-Clause
 [Desktop Entry]
 Type=Application

diff --git a/advent.h b/advent.h
index e3be9178572f96e9a95f8f3cefac35994cb4de21..55518cbe449adbf44d2e7e45b17d85aeebe15d80 100644 (file)
--- 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 <stdio.h>

diff --git a/adventure.yaml b/adventure.yaml
index 20697597850727bb35c5555da14f9426998dc75f..31988de02af8bc300f4a95e8d784ed226846dbee 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # 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 9842d5cf07d284153a8a9d9aba3578ac43083179..279bcd9e6fc8dddabc8cb6eea798251026dd55e9 100644 (file)
--- 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 <getopt.h>

diff --git a/hints.adoc b/hints.adoc
index c22c11b4e182d2b47bfc15ce24f818219fef7b8c..f7e25e19252c2d7a7e7f616673c3f02626ed6dec 100644 (file)
--- a/hints.adoc
+++ b/hints.adoc
@@ -1,5 +1,5 @@
 = Non-spoiler hints =
-// SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // 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 5384c2c7db18cb389ec6d6dde0807973a0153bbc..8ca5da72e979e974e2e9ff491f7c1b6102416882 100644 (file)
--- 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 <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // 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 4be4b6288297951d89fc836ed3e6babf2f5c4187..a620b2ca2aaa73603410f41f314a8036d3bbfdf0 100644 (file)
--- 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 2e7fdf2cc1169d1e4c6bc5fa1bd2a2000be78b9e..e0fdb69581ac4f9818de43faa0c12f2276a48520 100644 (file)
--- 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 0b8bc5328c5d10a42e7c5a0ed10cb83e3a6d4c18..8d7f71960d9954b16cd76e93fe51103d76ce175d 100755 (executable)
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # 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 35dd92fa0a08dbcd1befd531a1e76b37ecf19304..5a58895a39b0715b504ae620a632576a1151e99b 100755 (executable)
--- a/make_graph.py
+++ b/make_graph.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # SPDX-License-Identifier: BSD-2-Clause
 """\
 usage: make_graph.py [-a] [-d] [-m] [-s] [-v]

diff --git a/misc.c b/misc.c
index 432d5d8b795fbd76402ed7614d998c98ad18c7f0..c853237f742195bd1a837f8779737cac5de7df64 100644 (file)
--- 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 cc57885ec1176a48997aeb1f28a1dc189aa76929..b970e7cdffca285a800627faab2c1515fdc2f6d2 100644 (file)
--- 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 <esr@thyrsus.com>
+// SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // 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 0d1fbf445cea13fd90efb6b98a965b2366dfc05d..34404c69f548b591f2e8abddf967b3ca5c5e9faf 100644 (file)
--- 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 9d3d63f4129a9215c737210e9fdfeabb3428e450..1c9a397fe64b6771dbb17675a00ff9721a552f33 100644 (file)
--- 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 <stdlib.h>