Skip to content

Commit ca5695f

Browse files
authored
Merge pull request #107 from bgilbert/fsf
Sync LGPLv2.1 text with FSF; remove FSF mailing address
2 parents 11ded8f + ef9d423 commit ca5695f

File tree

6 files changed

+21
-27
lines changed

6 files changed

+21
-27
lines changed

_testdata/testdata_fetch.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
#
33
# testdata_fetch - Fetch openslide-testdata to local directory
44
#
5-
# Copyright (c) 2010-2015,2022 Carnegie Mellon University
5+
# Copyright (c) 2010-2015, 2022 Carnegie Mellon University
66
#
77
# This program is free software; you can redistribute it and/or modify it
88
# under the terms of version 2.1 of the GNU Lesser General Public License
99
# as published by the Free Software Foundation.
1010
#
11-
# This library is distributed in the hope that it will be useful, but
11+
# This program is distributed in the hope that it will be useful, but
1212
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1313
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
1414
# License for more details.
1515
#
1616
# You should have received a copy of the GNU Lesser General Public License
17-
# along with this library; if not, write to the Free Software Foundation,
18-
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1918
#
2019

2120
from __future__ import annotations

_testdata/testdata_index.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
#
33
# testdata_index - Check metadata and build indexes for openslide-testdata
44
#
5-
# Copyright (c) 2013-2015,2022 Carnegie Mellon University
5+
# Copyright (c) 2013-2015, 2022 Carnegie Mellon University
66
# Copyright (c) 2016 Benjamin Gilbert
77
#
88
# This program is free software; you can redistribute it and/or modify it
99
# under the terms of version 2.1 of the GNU Lesser General Public License
1010
# as published by the Free Software Foundation.
1111
#
12-
# This library is distributed in the hope that it will be useful, but
12+
# This program is distributed in the hope that it will be useful, but
1313
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1414
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
1515
# License for more details.
1616
#
1717
# You should have received a copy of the GNU Lesser General Public License
18-
# along with this library; if not, write to the Free Software Foundation,
19-
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
2019
#
2120

2221
from __future__ import annotations

demo/_synctiles.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
# Copyright (c) 2010-2015 Carnegie Mellon University
66
# Copyright (c) 2016-2023 Benjamin Gilbert
77
#
8-
# This library is free software; you can redistribute it and/or modify it
8+
# This program is free software; you can redistribute it and/or modify it
99
# under the terms of version 2.1 of the GNU Lesser General Public License
1010
# as published by the Free Software Foundation.
1111
#
12-
# This library is distributed in the hope that it will be useful, but
12+
# This program is distributed in the hope that it will be useful, but
1313
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1414
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
1515
# License for more details.
1616
#
1717
# You should have received a copy of the GNU Lesser General Public License
18-
# along with this library; if not, write to the Free Software Foundation,
19-
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
2019
#
2120

2221
from __future__ import annotations

demo/demo.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
* License for more details.
1515
*
1616
* You should have received a copy of the GNU Lesser General Public License
17-
* along with this library; if not, write to the Free Software Foundation,
18-
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1918
*/
2019

2120
html {

demo/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
License for more details.
1515
1616
You should have received a copy of the GNU Lesser General Public License
17-
along with this library; if not, write to the Free Software Foundation,
18-
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
along with this program. If not, see <https://www.gnu.org/licenses/>.
1918
-->
2019

2120
<!doctype html>

license/index.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ General Public License for more details.
1818
---
1919

2020
```
21-
GNU LESSER GENERAL PUBLIC LICENSE
22-
Version 2.1, February 1999
21+
GNU LESSER GENERAL PUBLIC LICENSE
22+
Version 2.1, February 1999
2323
2424
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
25-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25+
<https://fsf.org/>
2626
Everyone is permitted to copy and distribute verbatim copies
2727
of this license document, but changing it is not allowed.
2828
2929
[This is the first released version of the Lesser GPL. It also counts
3030
as the successor of the GNU Library Public License, version 2, hence
3131
the version number 2.1.]
3232
33-
Preamble
33+
Preamble
3434
3535
The licenses for most software are designed to take away your
3636
freedom to share and change it. By contrast, the GNU General Public
@@ -132,7 +132,7 @@ modification follow. Pay close attention to the difference between a
132132
former contains code derived from the library, whereas the latter must
133133
be combined with the library in order to run.
134134
135-
GNU LESSER GENERAL PUBLIC LICENSE
135+
GNU LESSER GENERAL PUBLIC LICENSE
136136
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
137137
138138
0. This License Agreement applies to any software library or other
@@ -452,7 +452,7 @@ decision will be guided by the two goals of preserving the free status
452452
of all derivatives of our free software and of promoting the sharing
453453
and reuse of software generally.
454454
455-
NO WARRANTY
455+
NO WARRANTY
456456
457457
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
458458
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -475,7 +475,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
475475
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
476476
DAMAGES.
477477
478-
END OF TERMS AND CONDITIONS
478+
END OF TERMS AND CONDITIONS
479479
480480
How to Apply These Terms to Your New Libraries
481481
@@ -504,8 +504,7 @@ convey the exclusion of warranty; and each file should have at least the
504504
Lesser General Public License for more details.
505505
506506
You should have received a copy of the GNU Lesser General Public
507-
License along with this library; if not, write to the Free Software
508-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
507+
License along with this library; if not, see <https://www.gnu.org/licenses/>.
509508
510509
Also add information on how to contact you by electronic and paper mail.
511510
@@ -516,8 +515,8 @@ necessary. Here is a sample; alter the names:
516515
Yoyodyne, Inc., hereby disclaims all copyright interest in the
517516
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
518517
519-
<signature of Ty Coon>, 1 April 1990
520-
Ty Coon, President of Vice
518+
<signature of Moe Ghoul>, 1 April 1990
519+
Moe Ghoul, President of Vice
521520
522521
That's all there is to it!
523522
```

0 commit comments

Comments
 (0)