gbranden pushed a commit to branch master
in repository groff.
commit 28b077566b33dd02c15766c3a80f0ed108705570
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Jul 31 15:10:42 2024 -0500
contrib/gdiffmk/*: Reorganize copyright info.
* Move copyright and license notice from "README" file to new file
"COPYRIGHT"; that is the convention that groff's overall "LICENSES"
file tells readers to expect.
* Align language and dates of copyright notices throughout the several
files in which they appear.
* More accurately document when the de facto change of maintainership
took place; if it happened after April 2015, don't blame Mike!
---
contrib/gdiffmk/COPYRIGHT | 28 ++++++++++++++++++++++++++++
contrib/gdiffmk/ChangeLog | 2 +-
contrib/gdiffmk/README | 22 ----------------------
contrib/gdiffmk/gdiffmk.1.man | 4 ++--
contrib/gdiffmk/gdiffmk.am | 8 +++++---
contrib/gdiffmk/gdiffmk.sh | 9 ++++++---
contrib/gdiffmk/tests/runtests.sh | 9 +++++----
7 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/contrib/gdiffmk/COPYRIGHT b/contrib/gdiffmk/COPYRIGHT
new file mode 100644
index 000000000..18019627a
--- /dev/null
+++ b/contrib/gdiffmk/COPYRIGHT
@@ -0,0 +1,28 @@
+Copyright (C) 2004-2023 Free Software Foundation, Inc.
+Written by Mike Bianchi <[email protected]>
+Changes from May 2015 onward by the groff development team
+
+This file is part of gdiffmk, which is part of 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.
+
+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. If not, write to the Free Software
+Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+
+##### Editor settings
+Local Variables:
+fill-column: 72
+mode: text
+End:
+vim: set textwidth=72:
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index 4d53aa2d0..c7d8fd759 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -279,7 +279,7 @@
First import of gdiffmk files.
-Copyright 2004-2020 Free Software Foundation, Inc.
+Copyright 2004-2023 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/contrib/gdiffmk/README b/contrib/gdiffmk/README
index 5359fa2a8..ad0c59248 100644
--- a/contrib/gdiffmk/README
+++ b/contrib/gdiffmk/README
@@ -22,28 +22,6 @@ Note the BUGS on the man page.
The 'tests' directory contains simple tests. 'runtests.sh' runs them
and compares the output against baseline files.
-----------------------------------------------------------------------------
-
-Copyright (C) 2004-2020 Free Software Foundation, Inc.
-Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
-
-This file is part of the gdiffmk utility, which is part of groff.
-
-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 groff; see the files COPYING and LICENSE in the top
-directory of the groff source. If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
-
##### Editor settings
Local Variables:
fill-column: 72
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.man
index 1d5a027e9..0f4528941 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -9,10 +9,10 @@ files
.\" Legal Terms
.\" ====================================================================
.\"
-.\" Copyright (C) 2004-2020 Free Software Foundation, Inc.
+.\" Copyright (C) 2004-2023 Free Software Foundation, Inc.
.\"
.\" This file is part of gdiffmk, which is part of groff, the GNU roff
-.\" type-setting system.
+.\" typesetting system.
.\"
.\" This program is free software: you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index 46f224ba8..12294d4bc 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -1,10 +1,12 @@
# Automake rules for 'gdiffmk' (integration into the groff source tree)
#
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
-# Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
+# Copyright (C) 2004-2023 Free Software Foundation, Inc.
+# Written by Mike Bianchi <[email protected]>
# Automake migration by Bertrand Garrigues
+# Changes from May 2015 onward by the groff development team
#
-# This file is part of the gdiffmk utility, which is part of groff.
+# This file is part of gdiffmk, which is part of 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
diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
index 8945f8543..60dfed6fd 100644
--- a/contrib/gdiffmk/gdiffmk.sh
+++ b/contrib/gdiffmk/gdiffmk.sh
@@ -1,9 +1,12 @@
#!@BASH_PROG@
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
-# Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
+# Copyright (C) 2004-2023 Free Software Foundation, Inc.
+# Written by Mike Bianchi <[email protected]>
+# Changes from May 2015 onward by the groff development team
+
# Thanks to Peter Bray for debugging.
-# This file is part of the gdiffmk utility, which is part of groff.
+# This file is part of gdiffmk, which is part of 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
diff --git a/contrib/gdiffmk/tests/runtests.sh
b/contrib/gdiffmk/tests/runtests.sh
index 1de1736a0..85745386a 100755
--- a/contrib/gdiffmk/tests/runtests.sh
+++ b/contrib/gdiffmk/tests/runtests.sh
@@ -2,11 +2,12 @@
#
# A very simple function test for gdiffmk.sh.
#
-# Copyright (C) 2004-2020, 2023 Free Software Foundation, Inc.
-# Written by Mike Bianchi <[email protected]>.
-# Subsequent modifications by G. Branden Robinson.
+# Copyright (C) 2004-2023 Free Software Foundation, Inc.
+# Written by Mike Bianchi <[email protected]>
+# Changes from May 2015 onward by the groff development team
-# This file is part of the gdiffmk utility, which is part of groff.
+# This file is part of gdiffmk, which is part of 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
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
