gbranden pushed a commit to branch master
in repository groff.
commit 75ca31ea3415f7f0d3950d128c3befea35e61d68
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Dec 18 21:30:16 2025 -0600
[chem]: Rationalize copyright licensing (1/3).
Bernd Warken stopped contributing to groff development ten years ago.
Six years before that, groff updated its use of the GPL from version 2
to version 3. I don't know if Bernd neglected to update the license
notices in his chem files from v2 to v3, or deliberately stuck with v2.
I assume the latter, because he omitted the "or any later version"
phrasing that the FSF encourages GPL users to employ.
At the same time, Bernd's choice is not binding on the copyrightable
contributions of others, and groff has been distributed under GNU GPLv3
since 2009, a fact that cannot have escaped him.
Consequently, I'll be adding a copy of GPLv2 to contrib/chem to reflect
Bernd's work, but retaining GPLv3-oriented license notices corresponding
to all work on it since then, which has mostly been done by GNU
maintainers of groff--Werner Lemberg, Bertrand Garrigues, and me.
$ git shortlog -s contrib/chem/
29 Bernd Warken
11 Bertrand Garrigues
3 Bjarni Ingi Gislason
1 Dave Kemper
2 Eric S. Raymond
86 G. Branden Robinson
1 Ingo Schwarze
1 Norwid Behrnd
5 Steffen Nurpmeso
21 Werner LEMBERG
3 Werner Lemberg
I leave as an exercise for the GPLv3-phobic the extraction of Bernd's
GPLv2-licensed work from the current chem source configuration, should
anyone be interested in doing so.
---
contrib/chem/README.txt | 23 -----------------------
contrib/chem/chem.1.man | 21 +++++++++++++--------
contrib/chem/chem.am | 23 ++++++++++++-----------
contrib/chem/chem.pic | 30 ++++++++++++++++--------------
contrib/chem/chem.pl | 27 ++++++++++++++-------------
contrib/chem/examples/122/README.txt | 25 -------------------------
contrib/chem/examples/README.txt | 24 ------------------------
7 files changed, 55 insertions(+), 118 deletions(-)
diff --git a/contrib/chem/README.txt b/contrib/chem/README.txt
index 625d41a9c..3316b5715 100644
--- a/contrib/chem/README.txt
+++ b/contrib/chem/README.txt
@@ -22,29 +22,6 @@ The subdirectory "examples/" contains example files for
chem. They are
written in the chem language. The file names end with .chem.
-####### License
-
-Copyright 2006-2020 Free Software Foundation, Inc.
-
-Written by Bernd Warken <[email protected]>.
-
-This file is part of chem.
-
-chem is distributed with groff, the GNU roff typesetting system.
-
-groff is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License (GPL) version 2 as
-published by the Free Software Foundation.
-
-groff is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-The GPL2 license text is available in the internet at
-<http://www.gnu.org/licenses/gpl-2.0.html>.
-
-
##### Editor settings
Local Variables:
fill-column: 72
diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index eb8562813..733b6ed2c 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -11,16 +11,21 @@ documents
.\"
.\" Copyright 2006-2020 Free Software Foundation, Inc.
.\"
-.\" This file is part of chem, which is part of groff, a free software
-.\" project.
+.\" chem is distributed with groff, the GNU roff typesetting system.
.\"
-.\" You can redistribute it and/or modify it under the terms of the GNU
-.\" General Public License version 2 (GPL2) as published by the Free
-.\" Software Foundation.
+.\" groff is free software; you can redistribute it and/or modify it
+.\" under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or
+.\" (at your option) any later version.
.\"
-.\" The license text for GPL2 is available in the internet at
-.\" <http://www.gnu.org/licenses/gpl-2.0.html>.
-.
+.\" groff is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+.\" or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program. If not, see
+.\" <https://www.gnu.org/licenses/>.
.
.\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
.do nr *groff_chem_1_man_C \n[.cp]
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index 3b9fef4d5..01fbbdf56 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -1,21 +1,22 @@
# Copyright 2006-2024 Free Software Foundation, Inc.
#
# Written by Bernd Warken <[email protected]>.
-# Moved to automake by Bertrand Garrigues
+# Automake migration by Bertrand Garrigues
#
-# This file is part of chem which is part of groff.
+# chem is distributed with groff, the GNU roff typesetting system.
#
-# groff is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) version 2 as
-# published by the Free Software Foundation.
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
#
-# groff is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
#
-# The GPL2 license text is available in the internet at
-# <http://www.gnu.org/licenses/gpl-2.0.html>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
chem_srcdir = $(top_srcdir)/contrib/chem
prefixexecbin_SCRIPTS += chem
diff --git a/contrib/chem/chem.pic b/contrib/chem/chem.pic
index 2c3525313..738c145cd 100644
--- a/contrib/chem/chem.pic
+++ b/contrib/chem/chem.pic
@@ -1,24 +1,26 @@
# macros for chem
-
+#
# Copyright 2006-2020 Free Software Foundation, Inc.
+#
# Written by Brian Kernighan <http://cm.bell-labs.com/cm/cs/who/bwk>,
# modified by Bernd Warken <[email protected]>.
-
+#
# This file is part of chem.
#
# chem is distributed with groff, the GNU roff typesetting system.
-
-# groff is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) version 2 as
-# published by the Free Software Foundation.
-
-# groff is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# The license text for GPL2 is available in the internet at
-# <http://www.gnu.org/licenses/gpl-2.0.html>.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
########################################################################
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index ab190b108..856874c1e 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -5,22 +5,23 @@
my $copyright = 'Copyright 2006-2014, 2022'
. ' Free Software Foundation, Inc.';
# Written by Bernd Warken <[email protected]>.
-
+#
# This file is part of chem.
#
# chem is distributed with groff, the GNU roff typesetting system.
-
-# groff is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License (GPL) version 2 as
-# published by the Free Software Foundation.
-
-# groff is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# The GPL2 license text is available in the internet at
-# <http://www.gnu.org/licenses/gpl-2.0.html>.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
########################################################################
# settings
diff --git a/contrib/chem/examples/122/README.txt
b/contrib/chem/examples/122/README.txt
index 43bc60f9a..94c7991ae 100644
--- a/contrib/chem/examples/122/README.txt
+++ b/contrib/chem/examples/122/README.txt
@@ -27,31 +27,6 @@ You can view the graphical display of the examples by calling
@g@chem <file> | groff -p ...
-####### License
-
-Copyright (C) 2006-2020 Free Software Foundation, Inc.
-Written by Bernd Warken <[email protected]>.
-
-This file is part of chem.
-
-chem is distributed with groff, the GNU roff typesetting system.
-
-groff is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License (GPL) version 2 as
-published by the Free Software Foundation.
-
-groff is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-The GPL2 license text is available in the internet at
-<http://www.gnu.org/licenses/gpl-2.0.html>.
-
-
##### Editor settings
Local Variables:
diff --git a/contrib/chem/examples/README.txt b/contrib/chem/examples/README.txt
index 9f19e659a..e2a61255d 100644
--- a/contrib/chem/examples/README.txt
+++ b/contrib/chem/examples/README.txt
@@ -18,30 +18,6 @@ stands for CH3-CH3, though this combination doesn't make
much sense
chemically.
-####### License
-
-Copyright 2006-2020 Free Software Foundation, Inc.
-
-Written by Bernd Warken <[email protected]>.
-
-This file is part of chem.
-
-chem is distributed with groff, the GNU roff typesetting system.
-
-groff is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-groff is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-The GPL2 license text is available in the internet at
-<http://www.gnu.org/licenses/gpl-2.0.html>.
-
-
##### Editor settings
Local Variables:
fill-column: 72
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
