Skip to content

Commit 137177a

Browse files
committed
Merge tag 'spdx-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull LICENSES update from Greg KH: "Here are some small changes to the LICENSES files, removing the physical address of the FSF as the old one was incorrect and they finally no longer have that listed in the license files. These updates come directly from the FSF copies of the files, so they mirror what they want the files to look like" * tag 'spdx-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: LICENSES: Replace the obsolete address of the FSF in the GFDL-1.2 LICENSES: Replace the obsolete address of the FSF in the GFDL-1.1 LICENSES: Replace the obsolete address of the FSF in the LGPL-2.1 LICENSES: Replace the obsolete address of the FSF in the LGPL-2.0 LICENSES: Replace the obsolete address of the FSF in the GPL-2.0 LICENSES: Replace the obsolete address of the FSF in the GPL-1.0
2 parents 4eee152 + 06a9a44 commit 137177a

File tree

6 files changed

+15
-18
lines changed

6 files changed

+15
-18
lines changed

LICENSES/deprecated/GFDL-1.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ License-Text:
2424
Version 1.1, March 2000
2525

2626
Copyright (C) 2000 Free Software Foundation, Inc.
27-
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27+
<https://fsf.org/>
2828
Everyone is permitted to copy and distribute verbatim copies
2929
of this license document, but changing it is not allowed.
3030

LICENSES/deprecated/GFDL-1.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ License-Text:
2323

2424

2525
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
26-
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26+
<https://fsf.org/>
2727
Everyone is permitted to copy and distribute verbatim copies
2828
of this license document, but changing it is not allowed.
2929

LICENSES/deprecated/GPL-1.0

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ License-Text:
1414
Version 1, February 1989
1515

1616
Copyright (C) 1989 Free Software Foundation, Inc.
17-
675 Mass Ave, Cambridge, MA 02139, USA
17+
<https://fsf.org/>
18+
1819
Everyone is permitted to copy and distribute verbatim copies
1920
of this license document, but changing it is not allowed.
2021

@@ -227,8 +228,7 @@ the exclusion of warranty; and each file should have at least the
227228
GNU General Public License for more details.
228229

229230
You should have received a copy of the GNU General Public License
230-
along with this program; if not, write to the Free Software
231-
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
231+
along with this program; if not, see <https://www.gnu.org/licenses/>.
232232

233233
Also add information on how to contact you by electronic and paper mail.
234234

LICENSES/preferred/GPL-2.0

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ License-Text:
2020
GNU GENERAL PUBLIC LICENSE
2121
Version 2, June 1991
2222

23-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
24-
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
23+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
24+
<https://fsf.org/>
2525
Everyone is permitted to copy and distribute verbatim copies
2626
of this license document, but changing it is not allowed.
2727

@@ -322,10 +322,8 @@ the "copyright" line and a pointer to where the full notice is found.
322322
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
323323
GNU General Public License for more details.
324324

325-
You should have received a copy of the GNU General Public License
326-
along with this program; if not, write to the Free Software
327-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
328-
325+
You should have received a copy of the GNU General Public License along
326+
with this program; if not, see <https://www.gnu.org/licenses/>.
329327

330328
Also add information on how to contact you by electronic and paper mail.
331329

LICENSES/preferred/LGPL-2.0

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GNU LIBRARY GENERAL PUBLIC LICENSE
1616
Version 2, June 1991
1717

1818
Copyright (C) 1991 Free Software Foundation, Inc.
19-
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
19+
<https://fsf.org/>
2020

2121
Everyone is permitted to copy and distribute verbatim copies of this
2222
license document, but changing it is not allowed.
@@ -468,8 +468,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
468468
License for more details.
469469

470470
You should have received a copy of the GNU Library General Public License
471-
along with this library; if not, write to the Free Software Foundation,
472-
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
471+
along with this library; if not, see <https://www.gnu.org/licenses/>.
473472

474473
Also add information on how to contact you by electronic and paper mail.
475474

LICENSES/preferred/LGPL-2.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
1818
Version 2.1, February 1999
1919

2020
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
21-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21+
<https://fsf.org/>
2222

2323
Everyone is permitted to copy and distribute verbatim copies of this
2424
license document, but changing it is not allowed.
@@ -488,9 +488,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
488488
for more details.
489489

490490
You should have received a copy of the GNU Lesser General Public License
491-
along with this library; if not, write to the Free Software Foundation,
492-
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add
493-
information on how to contact you by electronic and paper mail.
491+
along with this library; if not, see <https://www.gnu.org/licenses/>.
492+
493+
Also add information on how to contact you by electronic and paper mail.
494494

495495
You should also get your employer (if you work as a programmer) or your
496496
school, if any, to sign a "copyright disclaimer" for the library, if

0 commit comments

Comments
 (0)