From c17b9b2a163930867181ba9f298dcdf1382b7b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claude=20March=C3=A9?= <Claude.Marche@inria.fr>
Date: Tue, 13 Jan 2015 14:25:46 +0100
Subject: [PATCH] More license clairification
---
LICENSE | 4 ++--
Makefile.in | 5 +++--
share/images/fatcow/readme-fatcow.txt | 31 +++++++++++++++++++++++++++
src/ide/gconfig.ml | 2 +-
4 files changed, 37 insertions(+), 5 deletions(-)
create mode 100644 share/images/fatcow/readme-fatcow.txt
diff --git a/LICENSE b/LICENSE
index f19bb3f60..aeb8df4a8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -15,8 +15,8 @@ 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/*
+licenses, some of them may forbid commercial usage. These specific
+licenses are detailed in files share/icons/*/*.txt
======================================================================
diff --git a/Makefile.in b/Makefile.in
index ee4e74a8e..02928206b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,11 +276,12 @@ endif
cp -f modules/*.mlw $(DATADIR)/why3/modules
cp -f modules/mach/*.mlw $(DATADIR)/why3/modules/mach
cp -f drivers/*.drv drivers/*.gen $(DATADIR)/why3/drivers
+ cp -f LICENSE $(DATADIR)/why3/
cp -f share/provers-detection-data.conf $(DATADIR)/why3/
cp -f share/images/icons.rc $(DATADIR)/why3/images
cp -f share/images/*.png $(DATADIR)/why3/images
- cp -f share/images/boomy/*.png $(DATADIR)/why3/images/boomy
- cp -f share/images/fatcow/*.png $(DATADIR)/why3/images/fatcow
+ cp -f share/images/boomy/* $(DATADIR)/why3/images/boomy
+ cp -f share/images/fatcow/* $(DATADIR)/why3/images/fatcow
cp -f share/why3session.dtd $(DATADIR)/why3
cp -f share/Makefile.config $(DATADIR)/why3
cp -rf share/javascript $(DATADIR)/why3/javascript
diff --git a/share/images/fatcow/readme-fatcow.txt b/share/images/fatcow/readme-fatcow.txt
new file mode 100644
index 000000000..0b11cd51d
--- /dev/null
+++ b/share/images/fatcow/readme-fatcow.txt
@@ -0,0 +1,31 @@
+Free FatCow-Farm Fresh Icons
+http://www.fatcow.com/free-icons
+
+FatCow Farm-Fresh final release (3926 icons, 5 parts):
+- fatcow-hosting-icons-3.9.2.zip default (10.9 Mb)
+- fatcow-hosting-icons-3.9.2-color.zip (11.1 Mb)
+- fatcow-hosting-icons-3.9.2-grey.zip (6.9 Mb)
+- fatcow-hosting-icons-3.9.2-ico.zip (8.9 Mb)
+- fatcow-hosting-icons-3.9.2-all.zip (30.7 Mb)
+- fatcow-hosting-icons-3.9.2-ai-src.zip (2.82 !Gb)
+
+These icons are licensed under a Creative Commons Attribution 3.0 License.
+http://creativecommons.org/licenses/by/3.0/us/ if you do not know how to link
+back to FatCow's website, you can ask https://plus.google.com/+MarcisGasuns
+Biggest icon set drawn by a single designer (in pixel smooth style) worldwide.
+
+We are unavailable for custom icon design work. The project is
+closed (April 2014) and we do not plan to draw more metaphors.
+http://twitter.com/FatCow
+http://plus.google.com/+FatCow
+http://www.facebook.com/FatCow
+
+---------------------------------------------------------------------------------
+
+© Copyright 2009-2014 FatCow Web Hosting. All rights reserved.
+http://www.fatcow.com
+
+All other trademarks and copyrights
+are property of their respective owners.
+
+---------------------------------------------------------------------------------
diff --git a/src/ide/gconfig.ml b/src/ide/gconfig.ml
index 604b05181..c8fcbb72e 100644
--- a/src/ide/gconfig.ml
+++ b/src/ide/gconfig.ml
@@ -581,7 +581,7 @@ let show_about_window () =
"Makarius Wenzel";
]
~copyright:"Copyright 2010-2015 Inria, CNRS, Paris-Sud University"
- ~license:"GNU Lesser General Public License version 2.1"
+ ~license:("See file " ^ Filename.concat Config.datadir "LICENSE")
~website:"http://why3.lri.fr"
~website_label:"http://why3.lri.fr"
~version:Config.version
--
GitLab