Skip to content

Commit 09555d7

Browse files
committed
Update COPYRIGHT file
1 parent 338b277 commit 09555d7

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

COPYRIGHT

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Copyright:
1010
2000-2004, CMPP Project <http://cmpp.linuxforum.net>
1111
2015-2017 Darcy Shen <sadhen@zoho.com>
1212
2015-2020 Boyuan Yang <byang@debian.org>
13-
License: GFDL-1.2+
13+
License: GFDL-1.2-or-later
1414

1515
Files: utils/*
1616
Copyright:
@@ -27,7 +27,7 @@ Files:
2727
Copyright:
2828
Albert Cahalan
2929
Michael K. Johnson
30-
License: GPL-2.0
30+
License: GPL-2.0-only
3131
Comment: Files from procps-ng.
3232

3333
Files:
@@ -48,15 +48,22 @@ Files:
4848
Copyright:
4949
2003 Davide Libenzi <davidel@xmailserver.org>
5050
2021 Phi-Li (translator)
51-
License: GPL-2.0+
51+
License: GPL-2.0-or-later
5252

53-
License: GPL-2.0
53+
Files:
54+
src/man7/environ.7
55+
Copyright:
56+
1993 Michael Haardt (michael@moria.de)
57+
1997 Andries Brouwer (aeb@cwi.nl)
58+
License: GPL-2.0-or-later
59+
60+
License: GPL-2.0-only
5461
Licensed under version 2 of the GNU General Public License.
5562
.
5663
You should have received a copy of the GNU General Public License
5764
along with this program. If not, see <https://www.gnu.org/licenses/>
5865

59-
License: GPL-2.0+
66+
License: GPL-2.0-or-later
6067
This program is free software; you can redistribute it and/or modify
6168
it under the terms of the GNU General Public License as published by
6269
the Free Software Foundation; either version 2 of the License, or
@@ -113,7 +120,7 @@ License: permissive-gzip
113120
except that this permission notice may be stated in a translation approved
114121
by the Foundation.
115122

116-
License: GFDL-1.2+
123+
License: GFDL-1.2-or-later
117124
Permission is granted to copy, distribute and/or modify this document
118125
under the terms of the GNU Free Documentation License, Version 1.2
119126
or any later version published by the Free Software Foundation;

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* environ(7): Retranslate using upstream man page from Linux man-pages
44
6.9.1.
5+
* COPYRIGHT: Update information and use more SPDX short license name.
56
* Bump version string to 1.6.4.2.
67

78
2024-12-20 Boyuan Yang <073plan@gmail.com>

0 commit comments

Comments
 (0)