You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
116 lines
5.3 KiB
116 lines
5.3 KiB
From 9c384a1a84faea2d17af360a7f227d611f847160 Mon Sep 17 00:00:00 2001
|
|
From: Alec Leamas <alec@tests.notat.diaspora.com>
|
|
Date: Thu, 10 Oct 2013 09:42:12 +0200
|
|
Subject: [PATCH 105/105] Update COPYING to latest version.
|
|
|
|
As stated on the mailing list, current COPYING has wrong address to the
|
|
Free Software Foundation (they have moved) which causes some packaging
|
|
noise. Updated from latest version available at
|
|
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
---
|
|
COPYING | 33 ++++++++++++++++-----------------
|
|
1 file changed, 16 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/COPYING b/COPYING
|
|
index 60549be..d159169 100644
|
|
--- a/COPYING
|
|
+++ b/COPYING
|
|
@@ -1,12 +1,12 @@
|
|
- GNU GENERAL PUBLIC LICENSE
|
|
- Version 2, June 1991
|
|
+ GNU GENERAL PUBLIC LICENSE
|
|
+ Version 2, June 1991
|
|
|
|
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
|
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
Everyone is permitted to copy and distribute verbatim copies
|
|
of this license document, but changing it is not allowed.
|
|
|
|
- Preamble
|
|
+ Preamble
|
|
|
|
The licenses for most software are designed to take away your
|
|
freedom to share and change it. By contrast, the GNU General Public
|
|
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
|
General Public License applies to most of the Free Software
|
|
Foundation's software and to any other program whose authors commit to
|
|
using it. (Some other Free Software Foundation software is covered by
|
|
-the GNU Library General Public License instead.) You can apply it to
|
|
+the GNU Lesser General Public License instead.) You can apply it to
|
|
your programs, too.
|
|
|
|
When we speak of free software, we are referring to freedom, not
|
|
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
|
|
The precise terms and conditions for copying, distribution and
|
|
modification follow.
|
|
|
|
- GNU GENERAL PUBLIC LICENSE
|
|
+ GNU GENERAL PUBLIC LICENSE
|
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
|
|
0. This License applies to any program or other work which contains
|
|
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
|
|
of preserving the free status of all derivatives of our free software and
|
|
of promoting the sharing and reuse of software generally.
|
|
|
|
- NO WARRANTY
|
|
+ NO WARRANTY
|
|
|
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
POSSIBILITY OF SUCH DAMAGES.
|
|
|
|
- END OF TERMS AND CONDITIONS
|
|
+ END OF TERMS AND CONDITIONS
|
|
|
|
- How to Apply These Terms to Your New Programs
|
|
+ How to Apply These Terms to Your New Programs
|
|
|
|
If you develop a new program, and you want it to be of the greatest
|
|
possible use to the public, the best way to achieve this is to make it
|
|
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
|
|
the "copyright" line and a pointer to where the full notice is found.
|
|
|
|
<one line to give the program's name and a brief idea of what it does.>
|
|
- Copyright (C) 19yy <name of author>
|
|
+ Copyright (C) <year> <name of author>
|
|
|
|
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
|
|
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
|
|
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 this program; if not, write to the Free Software
|
|
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
-
|
|
+ You should have received a copy of the GNU General Public License along
|
|
+ with this program; if not, write to the Free Software Foundation, Inc.,
|
|
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
Also add information on how to contact you by electronic and paper mail.
|
|
|
|
If the program is interactive, make it output a short notice like this
|
|
when it starts in an interactive mode:
|
|
|
|
- Gnomovision version 69, Copyright (C) 19yy name of author
|
|
+ Gnomovision version 69, Copyright (C) year name of author
|
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
This is free software, and you are welcome to redistribute it
|
|
under certain conditions; type `show c' for details.
|
|
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
|
|
This General Public License does not permit incorporating your program into
|
|
proprietary programs. If your program is a subroutine library, you may
|
|
consider it more useful to permit linking proprietary applications with the
|
|
-library. If this is what you want to do, use the GNU Library General
|
|
+library. If this is what you want to do, use the GNU Lesser General
|
|
Public License instead of this License.
|
|
--
|
|
1.8.3.1
|
|
|