From 8b01e666384306c353981d171af3ddcea058ea3d Mon Sep 17 00:00:00 2001
From: Sebastien Dinot <sebastien.dinot@c-s.fr>
Date: Wed, 8 Mar 2017 10:04:17 +0100
Subject: [PATCH] LICENSE: Documentation now state that OTB is released under
the Apache license
---
CMake/Description.txt | 11 +++--
Copyright/CodeCopyright.txt | 36 ++++++++-------
.../SoftwareGuide/Latex/Abstract.tex | 10 ++---
Documentation/SoftwareGuide/Latex/FAQ.tex | 44 ++++++++++---------
.../MonteverdiGui/src/mvdAboutDialog.ui | 2 +-
README.md | 3 +-
i18n/fr_FR.ts | 2 +-
7 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/CMake/Description.txt b/CMake/Description.txt
index d1c13e2887..6fc9ccac65 100644
--- a/CMake/Description.txt
+++ b/CMake/Description.txt
@@ -2,12 +2,11 @@ Remote sensing processing library developed by CNES ORFEO Toolbox (OTB) is
distributed as an open source library of image processing algorithms. OTB is
based on the medical image processing library ITK and offers particular
functionalities for remote sensing image processing in general and for high
- spatial resolution images in particular. OTB is distributed under a free
- software licence CeCILL (similar to GPL) to encourage contribution from users
- and to promote reproducible research. The library is intensively tested on
- several platforms as Linux, Unix and Windows. Most functionnalies are also
- adapted to process huge images using streaming and multithreading as often as
- possible.
+ spatial resolution images in particular. OTB is distributed under the
+ permissive open source license Apache v2.0 - aka Apache Software License
+ (ASL) v2.0. The library is intensively tested on several platforms as Linux,
+ Unix and Windows. Most functionnalies are also adapted to process huge
+ images using streaming and multithreading as often as possible.
.
This package provide the new version of the Monteverdi GUI application
developed in Qt around the OTB library.
diff --git a/Copyright/CodeCopyright.txt b/Copyright/CodeCopyright.txt
index f79eceb770..b11f572020 100644
--- a/Copyright/CodeCopyright.txt
+++ b/Copyright/CodeCopyright.txt
@@ -1,17 +1,19 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ * https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/Documentation/SoftwareGuide/Latex/Abstract.tex b/Documentation/SoftwareGuide/Latex/Abstract.tex
index f752ca087b..e9ed4ef50f 100644
--- a/Documentation/SoftwareGuide/Latex/Abstract.tex
+++ b/Documentation/SoftwareGuide/Latex/Abstract.tex
@@ -54,10 +54,10 @@ software library. The goals of the OTB is to capitalise a methological
approach aiming to efficiently exploit the results obtained in the
frame of methodological R\&D studies.
-All the developments are based on FLOSS (Free/Libre Open Source
-Software) or existing CNES developments. OTB is distributed under the
-C\'eCILL licence,
-\url{http://www.cecill.info/licences/Licence_CeCILL_V2-en.html}.
+All the developments are based on FLOSS (Free/Libre Open Source Software) or
+existing CNES developments. OTB is distributed under the permissive open
+source license Apache v2.0 - aka Apache Software License (ASL) v2.0:\\
+\url{http://www.apache.org/licenses/LICENSE-2.0}
OTB is implemented in C++ and is mainly based on
ITK\footnote{http://www.itk.org} (Insight Toolkit).
@@ -77,5 +77,3 @@ ITK\footnote{http://www.itk.org} (Insight Toolkit).
%% Ce document constitue le guide d'utilisation et de d\'{e}veloppement de l'OTB. La version la plus r\'{e}cente de ce document est accessible \`{a}
%% \url{http://smsc.cnes.fr/PLEIADES/Fr/A_prog_accomp.htm/OTB/otbSoftwareGuide.pdf}.
-
-
diff --git a/Documentation/SoftwareGuide/Latex/FAQ.tex b/Documentation/SoftwareGuide/Latex/FAQ.tex
index f720f447ac..33f1ff9fb9 100644
--- a/Documentation/SoftwareGuide/Latex/FAQ.tex
+++ b/Documentation/SoftwareGuide/Latex/FAQ.tex
@@ -95,27 +95,29 @@ needed for the evolution of OTB.
\section{License}
\subsection{Which is the OTB license?}
-OTB is distributed under a CeCILL free software license:\\
-\url{http://www.cecill.info/licences/Licence_CeCILL_V2-en.html} which
-is recognized by the Free Software Foundation. It can be considered
-similar to the GNU GPL license.
+OTB is distributed under the permissive open source license Apache v2.0 - aka
+Apache Software License (ASL) v2.0:\\
+\url{http://www.apache.org/licenses/LICENSE-2.0}
\subsection{Am I forced to distribute my code based on OTB?}
No. The license gives you the option to distribute your application if
you want to. You do not have to exercise this option in the license.
-\subsection{Am I forced to contribute my code based on OTB into the official repo?}
-No. The CeCILL license impose only to distribute the source of the application to your users.
+\subsection{Am I forced to contribute my code based on OTB into the official
+ repo?}
+No.
-\subsection{If I wanted to distribute an application using OTB what license would I need to use?}
-The CeCILL license or the GNU GPL license.
+\subsection{If I wanted to distribute an application using OTB what license
+ would I need to use?}
+The license of your choice. The OTB license only requires you to include
+a copy of the Apache license and to provide a clear attribution to the OTB
+project in any distribution including a piece of OTB software.
\subsection{I am a commercial user. Is there any restriction on the
use of OTB?}
-OTB can be used internally ("in-house") without restriction, but only
-redistributed in other software that is under the CeCILL license.
-Moreover you need to distribute the source of your application to your
-users and only them.
+No. The OTB license only requires you to include a copy of the Apache license
+and to provide a clear attribution to the OTB project in any distribution
+including a piece of OTB software.
\section{Getting OTB}
@@ -125,12 +127,12 @@ Anybody can download the OTB at no cost.
\subsection{Where can I download the OTB?}
Go to \url{http://www.orfeo-toolbox.org}
and follow the "download OTB" link. You will have access to the OTB
-source code, to the Software User's Guide and to the Cookbook of the last release.
+source code, to the Software User's Guide and to the Cookbook of the last release.
Binary packages are also provided for the current version.
OTB and Monteverdi are also integrated in OSGeo-Live since version 4.5.
-You can find more information about the project at \url{http://live.osgeo.org/}.
-Moreover you can found the last release of Monteverdi and OTB applications through
-the OSGeo4W installer.
+You can find more information about the project at \url{http://live.osgeo.org/}.
+Moreover you can found the last release of Monteverdi and OTB applications through
+the OSGeo4W installer.
\subsection{How to get the latest bleeding-edge version?}\label{sec:FAQGit}
You can get the current development version, as our repository is public, using Git (available at \url{http://git-scm.com}). Be aware that, even if the golden rule is {\em what is committed will compile}, this is not always the case. Changes are usually more than ten per day.
@@ -184,7 +186,7 @@ You can use the 32 or 64 bit installer, since OSGeo4W provides all the necessary
Please follow carefully the procedure provided in the Software Guide.
Typically, when using the dependencies provided by OSGeo4W, compile OTB in Release or RelWithDebInfo mode.
-
+
\section{Using OTB}
\subsection{Where to start ?}
@@ -192,7 +194,7 @@ Typically, when using the dependencies provided by OSGeo4W, compile OTB in Relea
OTB presents a large set of features and it is not always easy to start using it.
After the installation, you can proceed to the tutorials (in the Software Guide).
This should give you a quick overview of the possibilities of OTB and will teach
-you how to build your own programs. You can also found some information in the OTB Cookbook in which we provide some recipes about remote sensing with OTB.
+you how to build your own programs. You can also found some information in the OTB Cookbook in which we provide some recipes about remote sensing with OTB.
\subsection{What is the image size limitation of OTB ?}
@@ -205,7 +207,7 @@ For the streaming to work, all the filters in the pipeline must be streaming
capable (this is the case for most of the filters in OTB). The output image
format also need to be streamable (not PNG or JPEG, but TIFF or ENVI formats, for instance).
-The class \doxygen{otb}{ImageFileWriter} manage the steaming process following two strategies: by tile or by strip. Different size configuration for these two strategies are available into the interface. The default mode use the information about how the file is streamed on the disk and will try to minimize the memory consumption along the pipeline. More information can be found into the documentation of the class.
+The class \doxygen{otb}{ImageFileWriter} manage the steaming process following two strategies: by tile or by strip. Different size configuration for these two strategies are available into the interface. The default mode use the information about how the file is streamed on the disk and will try to minimize the memory consumption along the pipeline. More information can be found into the documentation of the class.
\section{Getting help}
@@ -223,7 +225,7 @@ point for any new OTB user. The code source for these examples is
distributed with the toolbox. Another information source is the
on-line API documentation which is available at \url{http://www.orfeo-toolbox.org/doxygen}.
-You can also find some information about how to use Monteverdi and the OTB-Applications into the Cookbook at \url{http://www.orfeo-toolbox.org/CookBook/}.
+You can also find some information about how to use Monteverdi and the OTB-Applications into the Cookbook at \url{http://www.orfeo-toolbox.org/CookBook/}.
\section{Contributing to OTB}\label{sec:contributing}
@@ -343,7 +345,7 @@ change detector, a new feature extractor, etc.
A bugfix version is released when significant bugs are identified and fixed.
\subsection{When will the next version of OTB be available?}
-We plan to release two major new OTB version once a year. You can find some information into the roadmap section of the \href{http://wiki.orfeo-toolbox.org/index.php/Main_Page}{wiki}
+We plan to release two major new OTB version once a year. You can find some information into the roadmap section of the \href{http://wiki.orfeo-toolbox.org/index.php/Main_Page}{wiki}
\subsection{What features will the OTB include and when?}
There is no detailed plan about the availability of OTB new features,
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdAboutDialog.ui b/Modules/Visualization/MonteverdiGui/src/mvdAboutDialog.ui
index 3affacf899..5d20ab47fd 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdAboutDialog.ui
+++ b/Modules/Visualization/MonteverdiGui/src/mvdAboutDialog.ui
@@ -98,7 +98,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
- <string><br /><p>Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.</p><p>See Copyright.txt for details.</p><br /><p>Monteverdi is distributed under the CeCILL licence version 2. See</p><p>Licence_CeCILL_V2-en.txt or</p><p><a href="http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt">http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt</a> for more details.</p><br /><p>This software is distributed WITHOUT ANY WARRANTY; without even</p><p>the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR</p><p>PURPOSE. See the above copyright notices for more information</a>.</p><br /></string>
+ <string><p>Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)</p><p>Monteverdi is part of Orfeo Toolbox</p><a href="https://www.orfeo-toolbox.org/">https://www.orfeo-toolbox.org/</a><p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at</p><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a><p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p></string>
</property>
</widget>
</item>
diff --git a/README.md b/README.md
index 3e44cd127c..7ae06474de 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ It is community driven, extensible and heavily documented. Orfeo ToolBox is
not a black box!
[](https://travis-ci.org/orfeotoolbox/OTB)
-[](https://scan.coverity.com/projects/orfeo-toolbox)
+[](https://scan.coverity.com/projects/orfeo-toolbox)
### Resources
* [OTB's website](https://www.orfeo-toolbox.org/)
@@ -44,4 +44,3 @@ Please see the license and the Copyright directory for legal issues on the use o
### Issues
Please report any issue you might encouter to [our bugtracker](http://bugs.orfeo-toolbox.org).
-
diff --git a/i18n/fr_FR.ts b/i18n/fr_FR.ts
index 1779a7ffbc..9b7b50afd9 100644
--- a/i18n/fr_FR.ts
+++ b/i18n/fr_FR.ts
@@ -265,7 +265,7 @@ Veuillez, s'il vous plait, supprimer votre répertoire de cache Monteverdi.
<translation></translation>
</message>
<message>
- <source><br /><p>Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.</p><p>See Copyright.txt for details.</p><br /><p>Monteverdi is distributed under the CeCILL licence version 2. See</p><p>Licence_CeCILL_V2-en.txt or</p><p><a href="http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt">http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt</a> for more details.</p><br /><p>This software is distributed WITHOUT ANY WARRANTY; without even</p><p>the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR</p><p>PURPOSE. See the above copyright notices for more information</a>.</p><br /></source>
+ <source><br/><p>Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)</p><p>Monteverdi is part of Orfeo Toolbox</p><a href="https://www.orfeo-toolbox.org/">https://www.orfeo-toolbox.org/</a><p>Licensed under the Apache License, Version 2.0 (the "License");<br/>you may not use this file except in compliance with the License.<br/>You may obtain a copy of the License at</p><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a><p>Unless required by applicable law or agreed to in writing, software<br/>distributed under the License is distributed on an "AS IS" BASIS,<br/>WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<br/>See the License for the specific language governing permissions and<br/>limitations under the License.</p><br/></source>
<translation></translation>
</message>
<message>
--
GitLab