1 files changed, 30 insertions, 87 deletions
diff --git a/meta/files/common-licenses/NGPL b/meta/files/common-licenses/NGPL
index 31beeffc87..2096eab0fa 100644
--- a/meta/files/common-licenses/NGPL
+++ b/meta/files/common-licenses/NGPL
@@ -2,101 +2,44 @@
 NETHACK GENERAL PUBLIC LICENSE
-(Copyright 1989 M. Stephenson)
+(Copyright 1989 M. Stephenson) 
 (Based on the BISON general public license, copyright 1988 Richard M. Stallman)
-Everyone is permitted to copy and distribute verbatim copies of this license,
+Everyone is permitted to copy and distribute verbatim copies of this license, but changing it is not allowed. You can also use this wording to make the terms for other programs.
-but changing it is not allowed. You can also use this wording to make the terms
+The license agreements of most software companies keep you at the mercy of those companies. By contrast, our general public license is intended to give everyone the right to share NetHack. To make sure that you get the rights we want you to have, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. Hence this license agreement.
-for other programs.
-The license agreements of most software companies keep you at the mercy of
+Specifically, we want to make sure that you have the right to give away copies of NetHack, that you receive source code or else can get it if you want it, that you can change NetHack or use pieces of it in new free programs, and that you know you can do these things.
-those companies. By contrast, our general public license is intended to give
-everyone the right to share NetHack. To make sure that you get the rights we
+To make sure that everyone has such rights, we have to forbid you to deprive anyone else of these rights. For example, if you distribute copies of NetHack, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must tell them their rights.
-want you to have, we need to make restrictions that forbid anyone to deny you
-these rights or to ask you to surrender the rights. Hence this license
+Also, for our own protection, we must make certain that everyone finds out that there is no warranty for NetHack. If NetHack is modified by someone else and passed on, we want its recipients to know that what they have is not what we distributed.
-agreement.
+Therefore we (Mike Stephenson and other holders of NetHack copyrights) make the following terms which say what you must do to be allowed to distribute or change NetHack.
-Specifically, we want to make sure that you have the right to give away copies
-of NetHack, that you receive source code or else can get it if you want it,
-that you can change NetHack or use pieces of it in new free programs, and that
-you know you can do these things.
-To make sure that everyone has such rights, we have to forbid you to deprive
-anyone else of these rights. For example, if you distribute copies of NetHack,
-you must give the recipients all the rights that you have. You must make sure
-that they, too, receive or can get the source code. And you must tell them
-their rights.
-Also, for our own protection, we must make certain that everyone finds out that
-there is no warranty for NetHack. If NetHack is modified by someone else and
-passed on, we want its recipients to know that what they have is not what we
-distributed.
-Therefore we (Mike Stephenson and other holders of NetHack copyrights) make the
-following terms which say what you must do to be allowed to distribute or
-change NetHack.
 COPYING POLICIES
-You may copy and distribute verbatim copies of NetHack source code as you
+You may copy and distribute verbatim copies of NetHack source code as you receive it, in any medium, provided that you keep intact the notices on all files that refer to copyrights, to this License Agreement, and to the absence of any warranty; and give any other recipients of the NetHack program a copy of this License Agreement along with the program.
-receive it, in any medium, provided that you keep intact the notices on all
+You may modify your copy or copies of NetHack or any portion of it, and copy and distribute such modifications under the terms of Paragraph 1 above (including distributing this License Agreement), provided that you also do the following:
-files that refer to copyrights, to this License Agreement, and to the absence
+a) cause the modified files to carry prominent notices stating that you changed the files and the date of any change; and
-of any warranty; and give any other recipients of the NetHack program a copy of
-this License Agreement along with the program.
-You may modify your copy or copies of NetHack or any portion of it, and copy
-and distribute such modifications under the terms of Paragraph 1 above
-(including distributing this License Agreement), provided that you also do the
-following:
-a) cause the modified files to carry prominent notices stating that you changed
-the files and the date of any change; and
-b) cause the whole of any work that you distribute or publish, that in whole or
-in part contains or is a derivative of NetHack or any part thereof, to be
-licensed at no charge to all third parties on terms identical to those
-contained in this License Agreement (except that you may choose to grant more
-extensive warranty protection to some or all third parties, at your option)
-c) You may charge a distribution fee for the physical act of transferring a
-copy, and you may at your option offer warranty protection in exchange for a
-fee.
-You may copy and distribute NetHack (or a portion or derivative of it, under
-Paragraph 2) in object code or executable form under the terms of Paragraphs 1
-and 2 above provided that you also do one of the following:
-a) accompany it with the complete machine-readable source code, which must be
-distributed under the terms of Paragraphs 1 and 2 above; or,
-b) accompany it with full information as to how to obtain the complete machine-
-readable source code from an appropriate archive site. (This alternative is
-allowed only for noncommercial distribution.)
-For these purposes, complete source code means either the full source
-distribution as originally released over Usenet or updated copies of the files
-in this distribution used to create the object code or executable.
-You may not copy, sublicense, distribute or transfer NetHack except as
-expressly provided under this License Agreement. Any attempt otherwise to copy,
-sublicense, distribute or transfer NetHack is void and your rights to use the
-program under this License agreement shall be automatically terminated.
-However, parties who have received computer software programs from you with
-this License Agreement will not have their licenses terminated so long as such
-parties remain in full compliance.
-Stated plainly: You are permitted to modify NetHack, or otherwise use parts of
-NetHack, provided that you comply with the conditions specified above; in
-particular, your modified NetHack or program containing parts of NetHack must
-remain freely available as provided in this License Agreement. In other words,
-go ahead and share NetHack, but don't try to stop anyone else from sharing it
-farther.
-[ Home | Version 3.4.3 | Contact Us ]
-Hosted by:
-NetHack is Copyright 1985-2003 by Stichting Mathematisch Centrum and M.
-Stephenson. See our license for details.
-This site is Copyright 1999-2009 by Kenneth Lorber, Kensington, Maryland.
+b) cause the whole of any work that you distribute or publish, that in whole or in part contains or is a derivative of NetHack or any part thereof, to be licensed at no charge to all third parties on terms identical to those contained in this License Agreement (except that you may choose to grant more extensive warranty protection to some or all third parties, at your option)
+c) You may charge a distribution fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+You may copy and distribute NetHack (or a portion or derivative of it, under Paragraph 2) in object code or executable form under the terms of Paragraphs 1 and 2 above provided that you also do one of the following:
+a) accompany it with the complete machine-readable source code, which must be distributed under the terms of Paragraphs 1 and 2 above; or,
+b) accompany it with full information as to how to obtain the complete machine-readable source code from an appropriate archive site. (This alternative is allowed only for noncommercial distribution.)
+For these purposes, complete source code means either the full source distribution as originally released over Usenet or updated copies of the files in this distribution used to create the object code or executable.
+You may not copy, sublicense, distribute or transfer NetHack except as expressly provided under this License Agreement. Any attempt otherwise to copy, sublicense, distribute or transfer NetHack is void and your rights to use the program under this License agreement shall be automatically terminated. However, parties who have received computer software programs from you with this License Agreement will not have their licenses terminated so long as such parties remain in full compliance.
+Stated plainly: You are permitted to modify NetHack, or otherwise use parts of NetHack, provided that you comply with the conditions specified above; in particular, your modified NetHack or program containing parts of NetHack must remain freely available as provided in this License Agreement. In other words, go ahead and share NetHack, but don`t try to stop anyone else from sharing it farther. 
+[  Home  |  Version 3.4.3  |  Contact Us  ]
+Hosted by:       
+NetHack is Copyright 1985-2003 by Stichting Mathematisch Centrum and M. Stephenson. See our license for details.
+This site is Copyright 1999-2009 by Kenneth Lorber, Kensington, Maryland.

diff --git a/meta/files/common-licenses/NGPL b/meta/files/common-licenses/NGPL index 31beeffc87..2096eab0fa 100644 --- a/meta/files/common-licenses/NGPL +++ b/meta/files/common-licenses/NGPL
@@ -2,101 +2,44 @@
2		2
3	NETHACK GENERAL PUBLIC LICENSE	3	NETHACK GENERAL PUBLIC LICENSE
4		4
5	(Copyright 1989 M. Stephenson)	5	(Copyright 1989 M. Stephenson)
6	(Based on the BISON general public license, copyright 1988 Richard M. Stallman)	6	(Based on the BISON general public license, copyright 1988 Richard M. Stallman)
7		7
8	Everyone is permitted to copy and distribute verbatim copies of this license,	8	Everyone is permitted to copy and distribute verbatim copies of this license, but changing it is not allowed. You can also use this wording to make the terms for other programs.
9	but changing it is not allowed. You can also use this wording to make the terms	9	The license agreements of most software companies keep you at the mercy of those companies. By contrast, our general public license is intended to give everyone the right to share NetHack. To make sure that you get the rights we want you to have, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. Hence this license agreement.
10	for other programs.	10
11	The license agreements of most software companies keep you at the mercy of	11	Specifically, we want to make sure that you have the right to give away copies of NetHack, that you receive source code or else can get it if you want it, that you can change NetHack or use pieces of it in new free programs, and that you know you can do these things.
12	those companies. By contrast, our general public license is intended to give	12
13	everyone the right to share NetHack. To make sure that you get the rights we	13	To make sure that everyone has such rights, we have to forbid you to deprive anyone else of these rights. For example, if you distribute copies of NetHack, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must tell them their rights.
14	want you to have, we need to make restrictions that forbid anyone to deny you	14
15	these rights or to ask you to surrender the rights. Hence this license	15	Also, for our own protection, we must make certain that everyone finds out that there is no warranty for NetHack. If NetHack is modified by someone else and passed on, we want its recipients to know that what they have is not what we distributed.
16	agreement.	16
17		17	Therefore we (Mike Stephenson and other holders of NetHack copyrights) make the following terms which say what you must do to be allowed to distribute or change NetHack.
18	Specifically, we want to make sure that you have the right to give away copies
19	of NetHack, that you receive source code or else can get it if you want it,
20	that you can change NetHack or use pieces of it in new free programs, and that
21	you know you can do these things.
22
23	To make sure that everyone has such rights, we have to forbid you to deprive
24	anyone else of these rights. For example, if you distribute copies of NetHack,
25	you must give the recipients all the rights that you have. You must make sure
26	that they, too, receive or can get the source code. And you must tell them
27	their rights.
28
29	Also, for our own protection, we must make certain that everyone finds out that
30	there is no warranty for NetHack. If NetHack is modified by someone else and
31	passed on, we want its recipients to know that what they have is not what we
32	distributed.
33
34	Therefore we (Mike Stephenson and other holders of NetHack copyrights) make the
35	following terms which say what you must do to be allowed to distribute or
36	change NetHack.
37		18
38	COPYING POLICIES	19	COPYING POLICIES
39		20
40	You may copy and distribute verbatim copies of NetHack source code as you	21	You may copy and distribute verbatim copies of NetHack source code as you receive it, in any medium, provided that you keep intact the notices on all files that refer to copyrights, to this License Agreement, and to the absence of any warranty; and give any other recipients of the NetHack program a copy of this License Agreement along with the program.
41	receive it, in any medium, provided that you keep intact the notices on all	22	You may modify your copy or copies of NetHack or any portion of it, and copy and distribute such modifications under the terms of Paragraph 1 above (including distributing this License Agreement), provided that you also do the following:
42	files that refer to copyrights, to this License Agreement, and to the absence	23	a) cause the modified files to carry prominent notices stating that you changed the files and the date of any change; and
43	of any warranty; and give any other recipients of the NetHack program a copy of
44	this License Agreement along with the program.
45	You may modify your copy or copies of NetHack or any portion of it, and copy
46	and distribute such modifications under the terms of Paragraph 1 above
47	(including distributing this License Agreement), provided that you also do the
48	following:
49	a) cause the modified files to carry prominent notices stating that you changed
50	the files and the date of any change; and
51
52	b) cause the whole of any work that you distribute or publish, that in whole or
53	in part contains or is a derivative of NetHack or any part thereof, to be
54	licensed at no charge to all third parties on terms identical to those
55	contained in this License Agreement (except that you may choose to grant more
56	extensive warranty protection to some or all third parties, at your option)
57
58	c) You may charge a distribution fee for the physical act of transferring a
59	copy, and you may at your option offer warranty protection in exchange for a
60	fee.
61
62	You may copy and distribute NetHack (or a portion or derivative of it, under
63	Paragraph 2) in object code or executable form under the terms of Paragraphs 1
64	and 2 above provided that you also do one of the following:
65	a) accompany it with the complete machine-readable source code, which must be
66	distributed under the terms of Paragraphs 1 and 2 above; or,
67
68	b) accompany it with full information as to how to obtain the complete machine-
69	readable source code from an appropriate archive site. (This alternative is
70	allowed only for noncommercial distribution.)
71
72	For these purposes, complete source code means either the full source
73	distribution as originally released over Usenet or updated copies of the files
74	in this distribution used to create the object code or executable.
75
76	You may not copy, sublicense, distribute or transfer NetHack except as
77	expressly provided under this License Agreement. Any attempt otherwise to copy,
78	sublicense, distribute or transfer NetHack is void and your rights to use the
79	program under this License agreement shall be automatically terminated.
80	However, parties who have received computer software programs from you with
81	this License Agreement will not have their licenses terminated so long as such
82	parties remain in full compliance.
83	Stated plainly: You are permitted to modify NetHack, or otherwise use parts of
84	NetHack, provided that you comply with the conditions specified above; in
85	particular, your modified NetHack or program containing parts of NetHack must
86	remain freely available as provided in this License Agreement. In other words,
87	go ahead and share NetHack, but don't try to stop anyone else from sharing it
88	farther.
89	[ Home \| Version 3.4.3 \| Contact Us ]
90
91
92
93	Hosted by:
94	NetHack is Copyright 1985-2003 by Stichting Mathematisch Centrum and M.
95	Stephenson. See our license for details.
96	This site is Copyright 1999-2009 by Kenneth Lorber, Kensington, Maryland.
97		24
		25	b) cause the whole of any work that you distribute or publish, that in whole or in part contains or is a derivative of NetHack or any part thereof, to be licensed at no charge to all third parties on terms identical to those contained in this License Agreement (except that you may choose to grant more extensive warranty protection to some or all third parties, at your option)
98		26
		27	c) You may charge a distribution fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
99		28
		29	You may copy and distribute NetHack (or a portion or derivative of it, under Paragraph 2) in object code or executable form under the terms of Paragraphs 1 and 2 above provided that you also do one of the following:
		30	a) accompany it with the complete machine-readable source code, which must be distributed under the terms of Paragraphs 1 and 2 above; or,
100		31
		32	b) accompany it with full information as to how to obtain the complete machine-readable source code from an appropriate archive site. (This alternative is allowed only for noncommercial distribution.)
101		33
		34	For these purposes, complete source code means either the full source distribution as originally released over Usenet or updated copies of the files in this distribution used to create the object code or executable.
		35
		36	You may not copy, sublicense, distribute or transfer NetHack except as expressly provided under this License Agreement. Any attempt otherwise to copy, sublicense, distribute or transfer NetHack is void and your rights to use the program under this License agreement shall be automatically terminated. However, parties who have received computer software programs from you with this License Agreement will not have their licenses terminated so long as such parties remain in full compliance.
		37	Stated plainly: You are permitted to modify NetHack, or otherwise use parts of NetHack, provided that you comply with the conditions specified above; in particular, your modified NetHack or program containing parts of NetHack must remain freely available as provided in this License Agreement. In other words, go ahead and share NetHack, but don`t try to stop anyone else from sharing it farther.
		38	[ Home \| Version 3.4.3 \| Contact Us ]
		39
		40
		41
		42	Hosted by:
		43	NetHack is Copyright 1985-2003 by Stichting Mathematisch Centrum and M. Stephenson. See our license for details.
		44	This site is Copyright 1999-2009 by Kenneth Lorber, Kensington, Maryland.
102		45