Merge lp:~widelands-dev/widelands/bug994712 into lp:widelands

Proposed by Jens Beyer on 2013-07-24
Status: Merged
Merged at revision: 6673
Proposed branch: lp:~widelands-dev/widelands/bug994712
Merge into: lp:widelands
Diff against target: 354 lines (+54/-128)
8 files modified
COPYING (+20/-21)
src/ui_fsmenu/main.cc (+7/-1)
src/ui_fsmenu/main.h (+1/-0)
src/wlapplication.cc (+1/-1)
src/wui/game_options_menu.cc (+1/-1)
txts/license (+19/-103)
utils/win32/innosetup/Widelands.iss (+3/-1)
utils/win32/msvc/Widelands-msvc.iss.cmake (+2/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug994712
Reviewer Review Type Date Requested Status
Tino 2013-07-24 Approve on 2013-07-24
Review via email: mp+176747@code.launchpad.net

Description of the change

Proposal for license information.

1) additional license line in the main menu (bottom left)
2) changed text behind the "License" menu item in the main menu

Please note that someone may have to change the location of the Windows COPYING file (and possibly name, if that file is called COPYING.txt or something), and definitely someone must adapt the same for the MacOS part and fill it in the blank (____________).

To post a comment you must log in.
SirVer (sirver) wrote :

I added a line about Mac OS and fixed a few small things. Feel free to merge when you think it is good that way.

6659. By Tino on 2013-07-24

update GPL 2 COPYING file
Innosetup: Create menu entry for COPYING.txt
update description for windows

6660. By Tino on 2013-07-24

merge branch

Tino (tino79) wrote :

Did some updates on windows related stuff and i updated the COPYING file

review: Approve
Jens Beyer (qcumber-some) wrote :

Thanks to both of you.

I will add another copyright notice at the top and rewrite the last sentence to be more friendly and less legalese and then I'll merge this.

SirVer (sirver) wrote :

When you want to have another look, just ping me here.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'COPYING'
2--- COPYING 2002-02-05 20:54:08 +0000
3+++ COPYING 2013-07-24 19:24:26 +0000
4@@ -1,12 +1,12 @@
5- GNU GENERAL PUBLIC LICENSE
6- Version 2, June 1991
7+ GNU GENERAL PUBLIC LICENSE
8+ Version 2, June 1991
9
10- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
11- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
12+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
13+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
14 Everyone is permitted to copy and distribute verbatim copies
15 of this license document, but changing it is not allowed.
16
17- Preamble
18+ Preamble
19
20 The licenses for most software are designed to take away your
21 freedom to share and change it. By contrast, the GNU General Public
22@@ -15,7 +15,7 @@
23 General Public License applies to most of the Free Software
24 Foundation's software and to any other program whose authors commit to
25 using it. (Some other Free Software Foundation software is covered by
26-the GNU Library General Public License instead.) You can apply it to
27+the GNU Lesser General Public License instead.) You can apply it to
28 your programs, too.
29
30 When we speak of free software, we are referring to freedom, not
31@@ -55,8 +55,8 @@
32
33 The precise terms and conditions for copying, distribution and
34 modification follow.
35-
36
37- GNU GENERAL PUBLIC LICENSE
38+
39+ GNU GENERAL PUBLIC LICENSE
40 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
41
42 0. This License applies to any program or other work which contains
43@@ -110,7 +110,7 @@
44 License. (Exception: if the Program itself is interactive but
45 does not normally print such an announcement, your work based on
46 the Program is not required to print an announcement.)
47-
48
49+
50 These requirements apply to the modified work as a whole. If
51 identifiable sections of that work are not derived from the Program,
52 and can be reasonably considered independent and separate works in
53@@ -168,7 +168,7 @@
54 access to copy the source code from the same place counts as
55 distribution of the source code, even though third parties are not
56 compelled to copy the source along with the object code.
57-
58
59+
60 4. You may not copy, modify, sublicense, or distribute the Program
61 except as expressly provided under this License. Any attempt
62 otherwise to copy, modify, sublicense or distribute the Program is
63@@ -225,7 +225,7 @@
64
65 This section is intended to make thoroughly clear what is believed to
66 be a consequence of the rest of this License.
67-
68
69+
70 8. If the distribution and/or use of the Program is restricted in
71 certain countries either by patents or by copyrighted interfaces, the
72 original copyright holder who places the Program under this License
73@@ -255,7 +255,7 @@
74 of preserving the free status of all derivatives of our free software and
75 of promoting the sharing and reuse of software generally.
76
77- NO WARRANTY
78+ NO WARRANTY
79
80 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
81 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
82@@ -277,9 +277,9 @@
83 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
84 POSSIBILITY OF SUCH DAMAGES.
85
86- END OF TERMS AND CONDITIONS
87-
88
89- How to Apply These Terms to Your New Programs
90+ END OF TERMS AND CONDITIONS
91+
92+ How to Apply These Terms to Your New Programs
93
94 If you develop a new program, and you want it to be of the greatest
95 possible use to the public, the best way to achieve this is to make it
96@@ -303,17 +303,16 @@
97 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
98 GNU General Public License for more details.
99
100- You should have received a copy of the GNU General Public License
101- along with this program; if not, write to the Free Software
102- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
103-
104+ You should have received a copy of the GNU General Public License along
105+ with this program; if not, write to the Free Software Foundation, Inc.,
106+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
107
108 Also add information on how to contact you by electronic and paper mail.
109
110 If the program is interactive, make it output a short notice like this
111 when it starts in an interactive mode:
112
113- Gnomovision version 69, Copyright (C) year name of author
114+ Gnomovision version 69, Copyright (C) year name of author
115 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
116 This is free software, and you are welcome to redistribute it
117 under certain conditions; type `show c' for details.
118@@ -336,5 +335,5 @@
119 This General Public License does not permit incorporating your program into
120 proprietary programs. If your program is a subroutine library, you may
121 consider it more useful to permit linking proprietary applications with the
122-library. If this is what you want to do, use the GNU Library General
123+library. If this is what you want to do, use the GNU Lesser General
124 Public License instead of this License.
125
126=== modified file 'src/ui_fsmenu/main.cc'
127--- src/ui_fsmenu/main.cc 2013-02-09 23:36:30 +0000
128+++ src/ui_fsmenu/main.cc 2013-07-24 19:24:26 +0000
129@@ -87,8 +87,13 @@
130 UI::Align_BottomRight),
131 copyright
132 (this,
133+ 0, get_h() - 0.5 * m_buth,
134+ (wlcr + _("by the Widelands Development Team")).c_str(),
135+ UI::Align_BottomLeft),
136+ gpl
137+ (this,
138 0, get_h(),
139- (wlcr + _("by the Widelands Development Team")).c_str(),
140+ _("Licensed under the GNU General Public License V2.0"),
141 UI::Align_BottomLeft)
142 {
143 playtutorial.sigclicked.connect
144@@ -140,4 +145,5 @@
145
146 version.set_textstyle(ts_small());
147 copyright.set_textstyle(ts_small());
148+ gpl.set_textstyle(ts_small());
149 }
150
151=== modified file 'src/ui_fsmenu/main.h'
152--- src/ui_fsmenu/main.h 2012-02-15 21:25:34 +0000
153+++ src/ui_fsmenu/main.h 2013-07-24 19:24:26 +0000
154@@ -58,6 +58,7 @@
155 UI::Button exit;
156 UI::Textarea version;
157 UI::Textarea copyright;
158+ UI::Textarea gpl;
159 };
160
161 #endif
162
163=== modified file 'src/wlapplication.cc'
164--- src/wlapplication.cc 2013-07-21 08:27:10 +0000
165+++ src/wlapplication.cc 2013-07-24 19:24:26 +0000
166@@ -1591,7 +1591,7 @@
167 break;
168 }
169 case Fullscreen_Menu_Main::mm_license: {
170- Fullscreen_Menu_FileView ff("txts/COPYING");
171+ Fullscreen_Menu_FileView ff("txts/license");
172 ff.run();
173 break;
174 }
175
176=== modified file 'src/wui/game_options_menu.cc'
177--- src/wui/game_options_menu.cc 2013-02-09 23:36:30 +0000
178+++ src/wui/game_options_menu.cc 2013-07-24 19:24:26 +0000
179@@ -111,7 +111,7 @@
180 m_windows.license.constr = boost::bind
181 (&fileview_window, boost::ref(m_gb),
182 boost::ref(m_windows.license),
183- "txts/COPYING");
184+ "txts/license");
185 m_windows.authors.constr = boost::bind
186 (&fileview_window, boost::ref(m_gb),
187 boost::ref(m_windows.authors),
188
189=== renamed file 'txts/COPYING' => 'txts/license'
190--- txts/COPYING 2012-12-16 19:08:53 +0000
191+++ txts/license 2013-07-24 19:24:26 +0000
192@@ -1,106 +1,22 @@
193 title=_ "License"
194-text=_ ""<rt text-align=center><p font-size=38 font-face=DejaVuSerif font-color=2F9131>"
195-_"GNU general public licence"
196+text=""<rt text-align=center><p font-size=38 font-face=DejaVuSerif font-color=2F9131>"
197+_"Licensing information for Widelands"
198 "</p></rt>"
199-"<rt text-align=center><p font-size=14 font-style=italic>"
200-_"Version 2, June 1991<br></p></rt>"
201-"<rt><p line-spacing=3 font-size=12>"
202-_"Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br>59 Temple Place, Suite 330, Boston, MA 02111-1307 USA<br>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.<br>"
203-"</p>"
204-"<p font-decoration=underline font-size=14>"
205-_"Preamble"
206-"</p>"
207-"<p line-spacing=3 font-size=12><br>"
208-_"The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free 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 your programs, too.<br>When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.<br>To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.<br>For example, if you distribute copies of such a program, whether gratis or for a fee, 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 show them these terms so they know their rights.<br>We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.<br>Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.<br>Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.<br>The precise terms and conditions for copying, distribution and modification follow.<br>"
209-"</p>"
210-"<p font-decoration=underline font-size=14><br>"
211-_"GNU general public license terms and conditions for copying, distribution and modification"
212-"</p>"
213-"<p><br>"
214-_"0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The Program, below, refers to any such program or work, and a work based on the Program means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term modification.) Each licensee is addressed as you.<br>Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.<br>"
215-"<br>"
216-_"1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.<br>You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.<br>"
217-"<br>"
218-_"2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:<br><br>a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.<br>b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.<br>c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)"
219-"<br>"
220-"<br>"
221-_"These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.<br>Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.<br>In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License."
222-"<br>"
223-"<br>"
224-_"3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:<br><br>a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,<br>b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,<br>c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)"
225-"<br>"
226-"<br>"
227-_"The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable."
228-"<br>"
229-"<br>"
230-_"If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are notcompelled to copy the source along with the object code."
231-"<br>"
232-"<br>"
233-_"4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance."
234-"<br>"
235-"<br>"
236-_"5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it."
237-"<br>"
238-"<br>"
239-_"6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License."
240-"<br>"
241-"<br>"
242-_"7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program."
243-"<br>"
244-"<br>"
245-_"If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances."
246-"<br>"
247-"<br>"
248-_"It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice."
249-"<br>"
250-"<br>"
251-_"This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License."
252-"<br>"
253-"<br>"
254-_"8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License."
255-"<br>"
256-"<br>"
257-_"9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.<br>Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and any later version, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation."
258-"<br>"
259-"<br>"
260-_"10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes 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."
261-"<br>"
262-"</p>"
263-"<p font-decoration=underline font-size=14 font-weight=bold>"
264-_"No warranty"
265-"</p>"
266-"<p font-weight=bold>"
267-"<br>"
268-_"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 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
269-"<br>"
270-"<br>"
271-_"12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 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."
272-"<br>"
273-"<br>"
274-"</p>"
275-"<p font-decoration=underline font-size=14>"
276-_"End of Terms and Conditions"
277-"<br>"
278-"</p>"
279-"<p font-decoration=underline line-spacing=3 font-size=12>"
280-_"How to Apply These Terms to Your New Programs"
281-"<br>"
282-"</p>"
283-"<p>"
284-_"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 free software which everyone can redistribute and change under these terms."
285-"<br>"
286-"<br>"
287-_"To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively 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."
288-"<br>"
289-"<br>"
290-_"<one line to give the program's name and a brief idea of what it does.><br>Copyright (C) <year> <name of author><br><br>This program is free software; you can redistribute it and/or modify<br>it under the terms of the GNU General Public License as published by<br>the Free Software Foundation; either version 2 of the License, or<br>(at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License<br>along with this program; if not, write to the Free Software<br>Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA<br><br><br>Also add information on how to contact you by electronic and paper mail."
291-"<br><br>"
292-_"If the program is interactive, make it output a short notice like this<br>when it starts in an interactive mode:<br><br>Gnomovision version 69, Copyright (C) year name of author<br>Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.<br>This is free software, and you are welcome to redistribute it<br>under certain conditions; type `show c' for details."
293-"<br><br>"
294-_"The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.<br><br>You should also get your employer (if you work as a programmer) or your school, if any, to sign a copyright disclaimer for the program, if necessary. Here is a sample; alter the names:"
295-"<br><br>"
296-_"Yoyodyne, Inc., hereby disclaims all copyright interest in the program<br>`Gnomovision' (which makes passes at compilers) written by James Hacker.<br><br><signature of Ty Coon>, 1 April 1989<br>Ty Coon, President of Vice"
297-"<br><br>"
298-_"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 Public License instead of this License."
299+"<rt><p font-size=14><br><br>"
300+_"This game is Free and Open Source (FOSS), licensed under the GNU Generic Public License (GPL) V2.0."
301+"</p><p font-size=12 line-spacing=3><br><br>"
302+_"You can find more information on FOSS and the GPL by visiting the following webpage: "
303+_"http://www.gnu.org/licenses/old-licenses/gpl-2.0"
304+"<br>"
305+_"You can find the full text of the license there as well as further information about its philosophy and the legal implications."
306+"<br><br>"
307+_"We are also shipping the GPL as text document with Widelands itself."
308+"<br>"
309+_"On Linux, you can find the file called COPYING in the root of the source or standalone binary package, or in the installation directory (like /usr/share/games/widelands)."
310+""
311+_"On Windows, you can find the file called COPYING.txt in the installation folder and the Widelands Start menu entry provides a link to this file."
312+""
313+_"On MacOS, you can find the file called COPYING in the archive you downloaded from the website."
314+"<br><br></p><p font-size=14>"
315+_"This game comes as-is and without any warranty. If you have questions or need support, you may contact us at http://wl.widelands.org (forum) or https://launchpad.net/widelands (bugtracker)."
316 "</p></rt>""
317-
318
319=== modified file 'utils/win32/innosetup/Widelands.iss'
320--- utils/win32/innosetup/Widelands.iss 2013-05-25 14:02:11 +0000
321+++ utils/win32/innosetup/Widelands.iss 2013-07-24 19:24:26 +0000
322@@ -34,7 +34,8 @@
323 #define ExeName "widelands.exe"
324 #define UrlName "Widelands.url"
325 #define HelpName "Widelands-Onlinehelp.url"
326-#define HelpNameName "Widelands-Onlinehelp"
327+#define HelpNameName "Widelands-Onlinehelp"
328+#define Copying "COPYING.txt"
329
330 [Setup]
331 AppName={#Name}
332@@ -122,6 +123,7 @@
333 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
334 Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
335 Name: {userdesktop}\{#Name} - Mapeditor; Filename: {app}\{#ExeName}; Parameters: " --editor"; Tasks: desktopicon; WorkingDir: {app}; IconFilename: {app}\WL-Editor.ico; Comment: Directly starts the Widelands-Editor; Flags: useapppaths
336+Name: {group}\{#Copying}; Filename: {app}\{#Copying}
337
338 [Run]
339 Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent
340
341=== modified file 'utils/win32/msvc/Widelands-msvc.iss.cmake'
342--- utils/win32/msvc/Widelands-msvc.iss.cmake 2012-04-02 12:20:38 +0000
343+++ utils/win32/msvc/Widelands-msvc.iss.cmake 2013-07-24 19:24:26 +0000
344@@ -34,6 +34,7 @@
345 #define UrlName "Widelands.url"
346 #define HelpName "Widelands-Onlinehelp.url"
347 #define HelpNameName "Widelands-Onlinehelp"
348+#define Copying "COPYING.txt"
349
350 [Setup]
351 AppName={#Name}
352@@ -121,6 +122,7 @@
353 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
354 Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
355 Name: {userdesktop}\{#Name} - Mapeditor; Filename: {app}\{#ExeName}; Parameters: " --editor"; Tasks: desktopicon; WorkingDir: {app}; IconFilename: {app}\WL-Editor.ico; Comment: Directly starts the Widelands-Editor; Flags: useapppaths
356+Name: {group}\{#Copying}; Filename: {app}\{#Copying}
357
358 [Run]
359 Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent