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

Proposed by Jens Beyer
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 Approve
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.
Revision history for this message
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.

Revision history for this message
Tino (tino79) wrote :

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

review: Approve
Revision history for this message
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.

Revision history for this message
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
=== modified file 'COPYING'
--- COPYING 2002-02-05 20:54:08 +0000
+++ COPYING 2013-07-24 19:24:26 +0000
@@ -1,12 +1,12 @@
1 GNU GENERAL PUBLIC LICENSE1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 19912 Version 2, June 1991
33
4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6 Everyone is permitted to copy and distribute verbatim copies6 Everyone is permitted to copy and distribute verbatim copies
7 of this license document, but changing it is not allowed.7 of this license document, but changing it is not allowed.
88
9 Preamble9 Preamble
1010
11 The licenses for most software are designed to take away your11 The licenses for most software are designed to take away your
12freedom to share and change it. By contrast, the GNU General Public12freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
15General Public License applies to most of the Free Software15General Public License applies to most of the Free Software
16Foundation's software and to any other program whose authors commit to16Foundation's software and to any other program whose authors commit to
17using it. (Some other Free Software Foundation software is covered by17using it. (Some other Free Software Foundation software is covered by
18the GNU Library General Public License instead.) You can apply it to18the GNU Lesser General Public License instead.) You can apply it to
19your programs, too.19your programs, too.
2020
21 When we speak of free software, we are referring to freedom, not21 When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
5555
56 The precise terms and conditions for copying, distribution and56 The precise terms and conditions for copying, distribution and
57modification follow.57modification follow.
58
5958
60 GNU GENERAL PUBLIC LICENSE59
60 GNU GENERAL PUBLIC LICENSE
61 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION61 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
6262
63 0. This License applies to any program or other work which contains63 0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
110 License. (Exception: if the Program itself is interactive but110 License. (Exception: if the Program itself is interactive but
111 does not normally print such an announcement, your work based on111 does not normally print such an announcement, your work based on
112 the Program is not required to print an announcement.)112 the Program is not required to print an announcement.)
113
114113
114
115These requirements apply to the modified work as a whole. If115These requirements apply to the modified work as a whole. If
116identifiable sections of that work are not derived from the Program,116identifiable sections of that work are not derived from the Program,
117and can be reasonably considered independent and separate works in117and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
168access to copy the source code from the same place counts as168access to copy the source code from the same place counts as
169distribution of the source code, even though third parties are not169distribution of the source code, even though third parties are not
170compelled to copy the source along with the object code.170compelled to copy the source along with the object code.
171
172171
172
173 4. You may not copy, modify, sublicense, or distribute the Program173 4. You may not copy, modify, sublicense, or distribute the Program
174except as expressly provided under this License. Any attempt174except as expressly provided under this License. Any attempt
175otherwise to copy, modify, sublicense or distribute the Program is175otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
225225
226This section is intended to make thoroughly clear what is believed to226This section is intended to make thoroughly clear what is believed to
227be a consequence of the rest of this License.227be a consequence of the rest of this License.
228
229228
229
230 8. If the distribution and/or use of the Program is restricted in230 8. If the distribution and/or use of the Program is restricted in
231certain countries either by patents or by copyrighted interfaces, the231certain countries either by patents or by copyrighted interfaces, the
232original copyright holder who places the Program under this License232original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
255of preserving the free status of all derivatives of our free software and255of preserving the free status of all derivatives of our free software and
256of promoting the sharing and reuse of software generally.256of promoting the sharing and reuse of software generally.
257257
258 NO WARRANTY258 NO WARRANTY
259259
260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278POSSIBILITY OF SUCH DAMAGES.278POSSIBILITY OF SUCH DAMAGES.
279279
280 END OF TERMS AND CONDITIONS
281
282280
283 How to Apply These Terms to Your New Programs281 END OF TERMS AND CONDITIONS
282
283 How to Apply These Terms to Your New Programs
284284
285 If you develop a new program, and you want it to be of the greatest285 If you develop a new program, and you want it to be of the greatest
286possible use to the public, the best way to achieve this is to make it286possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@
303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304 GNU General Public License for more details.304 GNU General Public License for more details.
305305
306 You should have received a copy of the GNU General Public License306 You should have received a copy of the GNU General Public License along
307 along with this program; if not, write to the Free Software307 with this program; if not, write to the Free Software Foundation, Inc.,
308 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA308 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
309
310309
311Also add information on how to contact you by electronic and paper mail.310Also add information on how to contact you by electronic and paper mail.
312311
313If the program is interactive, make it output a short notice like this312If the program is interactive, make it output a short notice like this
314when it starts in an interactive mode:313when it starts in an interactive mode:
315314
316 Gnomovision version 69, Copyright (C) year name of author315 Gnomovision version 69, Copyright (C) year name of author
317 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.316 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318 This is free software, and you are welcome to redistribute it317 This is free software, and you are welcome to redistribute it
319 under certain conditions; type `show c' for details.318 under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
336This General Public License does not permit incorporating your program into335This General Public License does not permit incorporating your program into
337proprietary programs. If your program is a subroutine library, you may336proprietary programs. If your program is a subroutine library, you may
338consider it more useful to permit linking proprietary applications with the337consider it more useful to permit linking proprietary applications with the
339library. If this is what you want to do, use the GNU Library General338library. If this is what you want to do, use the GNU Lesser General
340Public License instead of this License.339Public License instead of this License.
341340
=== modified file 'src/ui_fsmenu/main.cc'
--- src/ui_fsmenu/main.cc 2013-02-09 23:36:30 +0000
+++ src/ui_fsmenu/main.cc 2013-07-24 19:24:26 +0000
@@ -87,8 +87,13 @@
87 UI::Align_BottomRight),87 UI::Align_BottomRight),
88 copyright88 copyright
89 (this,89 (this,
90 0, get_h() - 0.5 * m_buth,
91 (wlcr + _("by the Widelands Development Team")).c_str(),
92 UI::Align_BottomLeft),
93 gpl
94 (this,
90 0, get_h(),95 0, get_h(),
91 (wlcr + _("by the Widelands Development Team")).c_str(),96 _("Licensed under the GNU General Public License V2.0"),
92 UI::Align_BottomLeft)97 UI::Align_BottomLeft)
93{98{
94 playtutorial.sigclicked.connect99 playtutorial.sigclicked.connect
@@ -140,4 +145,5 @@
140145
141 version.set_textstyle(ts_small());146 version.set_textstyle(ts_small());
142 copyright.set_textstyle(ts_small());147 copyright.set_textstyle(ts_small());
148 gpl.set_textstyle(ts_small());
143}149}
144150
=== modified file 'src/ui_fsmenu/main.h'
--- src/ui_fsmenu/main.h 2012-02-15 21:25:34 +0000
+++ src/ui_fsmenu/main.h 2013-07-24 19:24:26 +0000
@@ -58,6 +58,7 @@
58 UI::Button exit;58 UI::Button exit;
59 UI::Textarea version;59 UI::Textarea version;
60 UI::Textarea copyright;60 UI::Textarea copyright;
61 UI::Textarea gpl;
61};62};
6263
63#endif64#endif
6465
=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc 2013-07-21 08:27:10 +0000
+++ src/wlapplication.cc 2013-07-24 19:24:26 +0000
@@ -1591,7 +1591,7 @@
1591 break;1591 break;
1592 }1592 }
1593 case Fullscreen_Menu_Main::mm_license: {1593 case Fullscreen_Menu_Main::mm_license: {
1594 Fullscreen_Menu_FileView ff("txts/COPYING");1594 Fullscreen_Menu_FileView ff("txts/license");
1595 ff.run();1595 ff.run();
1596 break;1596 break;
1597 }1597 }
15981598
=== modified file 'src/wui/game_options_menu.cc'
--- src/wui/game_options_menu.cc 2013-02-09 23:36:30 +0000
+++ src/wui/game_options_menu.cc 2013-07-24 19:24:26 +0000
@@ -111,7 +111,7 @@
111 m_windows.license.constr = boost::bind111 m_windows.license.constr = boost::bind
112 (&fileview_window, boost::ref(m_gb),112 (&fileview_window, boost::ref(m_gb),
113 boost::ref(m_windows.license),113 boost::ref(m_windows.license),
114 "txts/COPYING");114 "txts/license");
115 m_windows.authors.constr = boost::bind115 m_windows.authors.constr = boost::bind
116 (&fileview_window, boost::ref(m_gb),116 (&fileview_window, boost::ref(m_gb),
117 boost::ref(m_windows.authors),117 boost::ref(m_windows.authors),
118118
=== renamed file 'txts/COPYING' => 'txts/license'
--- txts/COPYING 2012-12-16 19:08:53 +0000
+++ txts/license 2013-07-24 19:24:26 +0000
@@ -1,106 +1,22 @@
1title=_ "License"1title=_ "License"
2text=_ ""<rt text-align=center><p font-size=38 font-face=DejaVuSerif font-color=2F9131>"2text=""<rt text-align=center><p font-size=38 font-face=DejaVuSerif font-color=2F9131>"
3_"GNU general public licence"3_"Licensing information for Widelands"
4"</p></rt>"4"</p></rt>"
5"<rt text-align=center><p font-size=14 font-style=italic>"5"<rt><p font-size=14><br><br>"
6_"Version 2, June 1991<br></p></rt>"6_"This game is Free and Open Source (FOSS), licensed under the GNU Generic Public License (GPL) V2.0."
7"<rt><p line-spacing=3 font-size=12>"7"</p><p font-size=12 line-spacing=3><br><br>"
8_"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>"8_"You can find more information on FOSS and the GPL by visiting the following webpage: "
9"</p>"9_"http://www.gnu.org/licenses/old-licenses/gpl-2.0"
10"<p font-decoration=underline font-size=14>"10"<br>"
11_"Preamble"11_"You can find the full text of the license there as well as further information about its philosophy and the legal implications."
12"</p>"12"<br><br>"
13"<p line-spacing=3 font-size=12><br>"13_"We are also shipping the GPL as text document with Widelands itself."
14_"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>"14"<br>"
15"</p>"15_"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)."
16"<p font-decoration=underline font-size=14><br>"16""
17_"GNU general public license terms and conditions for copying, distribution and modification"17_"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."
18"</p>"18""
19"<p><br>"19_"On MacOS, you can find the file called COPYING in the archive you downloaded from the website."
20_"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>"20"<br><br></p><p font-size=14>"
21"<br>"21_"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)."
22_"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>"
23"<br>"
24_"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.)"
25"<br>"
26"<br>"
27_"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."
28"<br>"
29"<br>"
30_"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.)"
31"<br>"
32"<br>"
33_"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."
34"<br>"
35"<br>"
36_"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."
37"<br>"
38"<br>"
39_"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."
40"<br>"
41"<br>"
42_"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."
43"<br>"
44"<br>"
45_"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."
46"<br>"
47"<br>"
48_"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."
49"<br>"
50"<br>"
51_"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."
52"<br>"
53"<br>"
54_"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."
55"<br>"
56"<br>"
57_"This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License."
58"<br>"
59"<br>"
60_"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."
61"<br>"
62"<br>"
63_"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."
64"<br>"
65"<br>"
66_"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."
67"<br>"
68"</p>"
69"<p font-decoration=underline font-size=14 font-weight=bold>"
70_"No warranty"
71"</p>"
72"<p font-weight=bold>"
73"<br>"
74_"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."
75"<br>"
76"<br>"
77_"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."
78"<br>"
79"<br>"
80"</p>"
81"<p font-decoration=underline font-size=14>"
82_"End of Terms and Conditions"
83"<br>"
84"</p>"
85"<p font-decoration=underline line-spacing=3 font-size=12>"
86_"How to Apply These Terms to Your New Programs"
87"<br>"
88"</p>"
89"<p>"
90_"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."
91"<br>"
92"<br>"
93_"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."
94"<br>"
95"<br>"
96_"<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."
97"<br><br>"
98_"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."
99"<br><br>"
100_"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:"
101"<br><br>"
102_"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"
103"<br><br>"
104_"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."
105"</p></rt>""22"</p></rt>""
106
10723
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2013-05-25 14:02:11 +0000
+++ utils/win32/innosetup/Widelands.iss 2013-07-24 19:24:26 +0000
@@ -34,7 +34,8 @@
34#define ExeName "widelands.exe"34#define ExeName "widelands.exe"
35#define UrlName "Widelands.url"35#define UrlName "Widelands.url"
36#define HelpName "Widelands-Onlinehelp.url"36#define HelpName "Widelands-Onlinehelp.url"
37#define HelpNameName "Widelands-Onlinehelp"37#define HelpNameName "Widelands-Onlinehelp"
38#define Copying "COPYING.txt"
3839
39[Setup]40[Setup]
40AppName={#Name}41AppName={#Name}
@@ -122,6 +123,7 @@
122Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe123Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
123Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe124Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
124Name: {userdesktop}\{#Name} - Mapeditor; Filename: {app}\{#ExeName}; Parameters: " --editor"; Tasks: desktopicon; WorkingDir: {app}; IconFilename: {app}\WL-Editor.ico; Comment: Directly starts the Widelands-Editor; Flags: useapppaths125Name: {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
126Name: {group}\{#Copying}; Filename: {app}\{#Copying}
125127
126[Run]128[Run]
127Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent129Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent
128130
=== modified file 'utils/win32/msvc/Widelands-msvc.iss.cmake'
--- utils/win32/msvc/Widelands-msvc.iss.cmake 2012-04-02 12:20:38 +0000
+++ utils/win32/msvc/Widelands-msvc.iss.cmake 2013-07-24 19:24:26 +0000
@@ -34,6 +34,7 @@
34#define UrlName "Widelands.url"34#define UrlName "Widelands.url"
35#define HelpName "Widelands-Onlinehelp.url"35#define HelpName "Widelands-Onlinehelp.url"
36#define HelpNameName "Widelands-Onlinehelp"36#define HelpNameName "Widelands-Onlinehelp"
37#define Copying "COPYING.txt"
3738
38[Setup]39[Setup]
39AppName={#Name}40AppName={#Name}
@@ -121,6 +122,7 @@
121Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe122Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#Name}; Filename: {app}\{#ExeName}; Tasks: quicklaunchicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
122Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe123Name: {userdesktop}\{#Name}; Filename: {app}\{#ExeName}; Tasks: desktopicon; WorkingDir: {app}; Flags: useapppaths; IconFilename: {app}\widelands.exe
123Name: {userdesktop}\{#Name} - Mapeditor; Filename: {app}\{#ExeName}; Parameters: " --editor"; Tasks: desktopicon; WorkingDir: {app}; IconFilename: {app}\WL-Editor.ico; Comment: Directly starts the Widelands-Editor; Flags: useapppaths124Name: {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
125Name: {group}\{#Copying}; Filename: {app}\{#Copying}
124126
125[Run]127[Run]
126Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent128Filename: {app}\{#ExeName}; Description: {cm:LaunchProgram,{#Name}}; Flags: nowait postinstall skipifsilent

Subscribers

People subscribed via source and target branches

to status/vote changes: