From: Benjamin Auder <benjamin.auder@somewhere>
Date: Tue, 29 May 2018 15:57:23 +0000 (+0200)
Subject: update LICENSE form for CRAN
X-Git-Url: https://git.auder.net/css/vendor/doc/current/rpsls.js?a=commitdiff_plain;h=810d82e8ad14e89caf209efccd624a044c611495;p=morpheus.git

update LICENSE form for CRAN
---

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 98c76d7..166779e 100644
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -4,7 +4,7 @@ Description: Mixture of logistic regressions parameters (H)estimation with
     (U)spectral methods. The main methods take d-dimensional inputs and a vector
     of binary outputs, and return parameters according to the GLMs mixture model
     (General Linear Model). For more details see chapter 3 in the PhD thesis of
-		Mor-Absa Loum: http://www.theses.fr/s156435.
+		Mor-Absa Loum: <http://www.theses.fr/s156435>.
 Version: 0.2-0
 Author: Benjamin Auder <Benjamin.Auder@math.u-psud.fr> [aut,cre],
     Mor-Absa Loum <Mor-Absa.Loum@math.u-psud.fr> [aut]
diff --git a/pkg/LICENSE b/pkg/LICENSE
index 5d50df5..6a8f2de 100644
--- a/pkg/LICENSE
+++ b/pkg/LICENSE
@@ -1,20 +1,2 @@
-Copyright (c) 2016-2017, Mor-Absa Loum ; 2017, Benjamin Auder
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+YEAR: 2016-2018
+COPYRIGHT HOLDER: Mor-Absa Loum, Benjamin Auder