Skip to content

Commit 703601d

Browse files
committed
Update COPYING with GPLv2 with new FSF address
The mailing address of FSF changed quite a while ago. Also the expansion of the acronym LGPL (which we don't use) is "Lesser GPL" not "Library GPL" these days in recent copies of GPLv2. Update the copy we have with a fresh download of <http://www.gnu.org/licenses/gpl-2.0.txt>. This incidentally removes form-feeds in the text we retained for all these years. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5611972 commit 703601d

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

COPYING

+12-13
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
GNU GENERAL PUBLIC LICENSE
2323
Version 2, June 1991
2424

25-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
26-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
26+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2727
Everyone is permitted to copy and distribute verbatim copies
2828
of this license document, but changing it is not allowed.
2929

@@ -36,7 +36,7 @@ software--to make sure the software is free for all its users. This
3636
General Public License applies to most of the Free Software
3737
Foundation's software and to any other program whose authors commit to
3838
using it. (Some other Free Software Foundation software is covered by
39-
the GNU Library General Public License instead.) You can apply it to
39+
the GNU Lesser General Public License instead.) You can apply it to
4040
your programs, too.
4141

4242
When we speak of free software, we are referring to freedom, not
@@ -76,7 +76,7 @@ patent must be licensed for everyone's free use or not licensed at all.
7676

7777
The precise terms and conditions for copying, distribution and
7878
modification follow.
79-
79+
8080
GNU GENERAL PUBLIC LICENSE
8181
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
8282

@@ -131,7 +131,7 @@ above, provided that you also meet all of these conditions:
131131
License. (Exception: if the Program itself is interactive but
132132
does not normally print such an announcement, your work based on
133133
the Program is not required to print an announcement.)
134-
134+
135135
These requirements apply to the modified work as a whole. If
136136
identifiable sections of that work are not derived from the Program,
137137
and can be reasonably considered independent and separate works in
@@ -189,7 +189,7 @@ access to copy from a designated place, then offering equivalent
189189
access to copy the source code from the same place counts as
190190
distribution of the source code, even though third parties are not
191191
compelled to copy the source along with the object code.
192-
192+
193193
4. You may not copy, modify, sublicense, or distribute the Program
194194
except as expressly provided under this License. Any attempt
195195
otherwise to copy, modify, sublicense or distribute the Program is
@@ -246,7 +246,7 @@ impose that choice.
246246

247247
This section is intended to make thoroughly clear what is believed to
248248
be a consequence of the rest of this License.
249-
249+
250250
8. If the distribution and/or use of the Program is restricted in
251251
certain countries either by patents or by copyrighted interfaces, the
252252
original copyright holder who places the Program under this License
@@ -299,7 +299,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
299299
POSSIBILITY OF SUCH DAMAGES.
300300

301301
END OF TERMS AND CONDITIONS
302-
302+
303303
How to Apply These Terms to Your New Programs
304304

305305
If you develop a new program, and you want it to be of the greatest
@@ -324,10 +324,9 @@ the "copyright" line and a pointer to where the full notice is found.
324324
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
325325
GNU General Public License for more details.
326326

327-
You should have received a copy of the GNU General Public License
328-
along with this program; if not, write to the Free Software
329-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
330-
327+
You should have received a copy of the GNU General Public License along
328+
with this program; if not, write to the Free Software Foundation, Inc.,
329+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
331330

332331
Also add information on how to contact you by electronic and paper mail.
333332

@@ -357,5 +356,5 @@ necessary. Here is a sample; alter the names:
357356
This General Public License does not permit incorporating your program into
358357
proprietary programs. If your program is a subroutine library, you may
359358
consider it more useful to permit linking proprietary applications with the
360-
library. If this is what you want to do, use the GNU Library General
359+
library. If this is what you want to do, use the GNU Lesser General
361360
Public License instead of this License.

0 commit comments

Comments
 (0)