From 3100076ff171ccda174196d350f737f102a15d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claude=20March=C3=A9?= <Claude.Marche@inria.fr>
Date: Tue, 13 Jan 2015 13:26:15 +0100
Subject: [PATCH] Licenses clarification
---
LICENSE | 6 ++++--
misc/header.txt | 3 +--
share/images/boomy/license.txt | 26 ++++++++++++++++++++++++++
src/ide/gconfig.ml | 4 ++--
4 files changed, 33 insertions(+), 6 deletions(-)
create mode 100644 share/images/boomy/license.txt
diff --git a/LICENSE b/LICENSE
index c6d03e911..f19bb3f60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,6 +14,10 @@ of the Library that is distributed under the conditions defined in clause
however invalidate any other reasons why the executable file might be
covered by the GNU Lesser General Public License.
+Icon sets for the graphical interface of Why3 are subject to specific
+licenses, some of them may forbid commercial usage. See details in
+subdirectories share/icons/*
+
======================================================================
GNU LESSER GENERAL PUBLIC LICENSE
@@ -523,5 +527,3 @@ if necessary. Here is a sample; alter the names:
Ty Coon, President of Vice
That's all there is to it!
-
-
diff --git a/misc/header.txt b/misc/header.txt
index 7e9b72443..c55c2849b 100644
--- a/misc/header.txt
+++ b/misc/header.txt
@@ -1,8 +1,7 @@
The Why3 Verification Platform / The Why3 Development Team
-Copyright 2010-2014 -- INRIA - CNRS - Paris-Sud University
+Copyright 2010-2015 -- INRIA - CNRS - Paris-Sud University
This software is distributed under the terms of the GNU Lesser
General Public License version 2.1, with the special exception
on linking described in file LICENSE.
-
diff --git a/share/images/boomy/license.txt b/share/images/boomy/license.txt
new file mode 100644
index 000000000..63704bef0
--- /dev/null
+++ b/share/images/boomy/license.txt
@@ -0,0 +1,26 @@
+Boomy toolbar icon set license
+
+This is a legal agreement between You, the user, and Milosz Wlazlo.
+By downloading the Boomy icon set, You agree to the following:
+
+All icons in the Boomy toolbar package are for personal use only. You
+may also use the icons in open source and freeware projects as long as
+you give credits to the author of the icons and link to his website
+(miloszwl.deviantart.com).
+
+The image data may be changed by You in a limited way, only by
+combining the included icons and adjusting hue, saturation,
+brightness.
+
+All icons are provided "As is". The Miloszwl.com shall not be liable
+for any kind of harm caused by use of, or the inability to use, this
+icon set or any individual image.
+
+You agree that all ownership and copyrights of the icons remain the
+property of Milosz Wlazlo (Miloszwl.com). You may not resell or
+redistribute the icons in any kind of commercial project or internet
+icon archive.
+
+
+Contact: miloszwl@miloszwl.com
+Web: miloszwl.deviantart.com
diff --git a/src/ide/gconfig.ml b/src/ide/gconfig.ml
index 4470e23a2..604b05181 100644
--- a/src/ide/gconfig.ml
+++ b/src/ide/gconfig.ml
@@ -105,7 +105,7 @@ let default_ide =
ide_show_labels = false;
ide_show_locs = false;
ide_show_time_limit = false;
- ide_max_boxes = 16;
+ ide_max_boxes = 16;
ide_saving_policy = 2;
ide_premise_color = "chartreuse";
ide_goal_color = "gold";
@@ -580,7 +580,7 @@ let show_about_window () =
"Piotr Trojanek";
"Makarius Wenzel";
]
- ~copyright:"Copyright 2010-2014 Inria, CNRS, Paris-Sud University"
+ ~copyright:"Copyright 2010-2015 Inria, CNRS, Paris-Sud University"
~license:"GNU Lesser General Public License version 2.1"
~website:"http://why3.lri.fr"
~website_label:"http://why3.lri.fr"
--
GitLab