gbranden pushed a commit to branch master
in repository groff.
commit e41299cb09be1a80beeb0757a6d555a37fbe0b81
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Dec 18 20:48:28 2025 -0600
[glilypond]: Update license notices.
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 glilypond 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/glilypond 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/glilypond
35 Bernd Warken
7 Bertrand Garrigues
1 Colin Watson
76 G. Branden Robinson
1 Ingo Schwarze
1 Ralph Corderoy
5 Steffen Nurpmeso
1 Werner LEMBERG
5 Werner Lemberg
I leave as an exercise for the GPLv3-phobic the extraction of Bernd's
GPLv2-licensed work from the current glilypond source configuration,
should anyone be interested in doing so.
---
contrib/glilypond/README.txt | 4 ----
contrib/glilypond/examples/example.groff | 26 ++++++++++++++++----------
contrib/glilypond/glilypond.1.man | 24 ++++++++++++++++--------
contrib/glilypond/glilypond.am | 29 +++++++++++++++--------------
contrib/glilypond/glilypond.pl | 24 ++++++++++++------------
5 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/contrib/glilypond/README.txt b/contrib/glilypond/README.txt
index f47e824a5..77b01542d 100644
--- a/contrib/glilypond/README.txt
+++ b/contrib/glilypond/README.txt
@@ -6,15 +6,11 @@
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
- This file is part of 'glilypond', which is part of 'groff'.
-
-
########################################################################
In order to run 'glilypond', your system must have installed Perl of at
least version 'v5.6'.
-
########################################################################
In order to have this program installed by 'make', the creation of a
diff --git a/contrib/glilypond/examples/example.groff
b/contrib/glilypond/examples/example.groff
index 856474e01..f274c2787 100644
--- a/contrib/glilypond/examples/example.groff
+++ b/contrib/glilypond/examples/example.groff
@@ -3,22 +3,28 @@
.\" --------------------------------------------------------------------
.
.ig
-glilypond - integrate 'lilypond' parts into 'groff' files
+glilypond - integrate lilypond parts into groff files
This file was written by Bernd Warken <groff\-bernd.warken\[email protected]>.
-.
+
Copyright (C) 2013-2020 Free Software Foundation, Inc.
-This file is part of glilypond, which is part of GNU groff, a free
-software project.
+This file is part of glilypond.
+
+glilypond 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.
-You can redistribute it and/or modify it under the terms of the GNU
-General Public License 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 is available in the internet at
-.UR http://\%www.gnu.org/\%licenses/\%gpl-2.0.html
-.UE .
+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/glilypond/glilypond.1.man
b/contrib/glilypond/glilypond.1.man
index fee67b66b..ebb675025 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -13,16 +13,24 @@ documents
.\"
.\" Copyright (C) 2013-2020 Free Software Foundation, Inc.
.\"
-.\" This file is part of glilypond, which is part of GNU groff, a free
-.\" software project.
+.\" This file is part of glilypond.
.\"
-.\" 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.
+.\" glilypond is distributed with groff, the GNU roff typesetting
+.\" system.
.\"
-.\" The 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/>.
.
.\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
.do nr *groff_glilypond_1_man_C \n[.cp]
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 7b60ebcc0..787bc8ed4 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -1,32 +1,34 @@
# Automake rules for 'glilypond'
-
+#
# Copyright (C) 2013-2020 Free Software Foundation, Inc.
# Written by Werner Lemberg <[email protected]> and
# Bernd Warken <[email protected]>.
# Automake migration by Bertrand Garrigues
-
-# This file is part of 'glilypond' which is part of groff.
-
+#
+# This file is part of glilypond.
+#
+# glilypond 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.
-
+#
+# 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/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
-########################################################################
glilypond_srcdir = $(top_srcdir)/contrib/glilypond
bin_SCRIPTS += glilypond
man1_MANS += contrib/glilypond/glilypond.1
# files going to lib directory '$(glilypond_dir)'
-# TODO glilypond_dir is subsitued by configure.ac, check if this could be
removed
+# TODO: glilypond_dir is substituted by configure.ac; check if this
+# could be removed.
glilyponddir = $(glilypond_dir)
EXTRA_DIST += \
@@ -37,7 +39,6 @@ EXTRA_DIST += \
contrib/glilypond/README.txt \
contrib/glilypond/examples/example.groff
-
# create perl executable 'glilypond', being stored into 'bindir'
glilypond: $(glilypond_srcdir)/glilypond.pl $(SH_DEPS_SED_SCRIPT)
$(AM_V_GEN)$(RM) $@ \
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond.pl
index ed70424fe..7a2c9790f 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -33,22 +33,22 @@ glilypond - integrate 'lilypond' into 'groff' files
Copyright (C) 2013-2020 Free Software Foundation, Inc.
Written by Bernd Warken <[email protected]>
-This file is part of 'GNU groff'.
+This file is part of glilypond.
- 'GNU 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
+glilypond 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.
- 'GNU 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.
- You should have received a copy of the 'GNU General Public License'
-along with 'groff', see the files 'COPYING' and 'LICENSE' in the top
-directory of the 'groff' source package. If not, see
-<http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
*;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
