[gentoo-commits] proj/sci:master commit in: licenses/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     51914e3305d2364a930d6baa6ef7ce2663621c19
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Wed Jan  7 21:35:20 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Wed Jan  7 21:35:20 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=51914e33

update Tablet license

---
 licenses/Tablet | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/licenses/Tablet b/licenses/Tablet
index d81931a..296b09c 100644
--- a/licenses/Tablet
+++ b/licenses/Tablet
@@ -1,36 +1,10 @@
-   Tablet uses a modified version of the [1]BSD License which has been
-   edited to remove references to distribution and use in source forms.
-   This means that we are happy for you to distribute and use Tablet
-   however you please, but we do not (yet) want to make the source code
-   publicly available.
+Copyright (c) 2009-2014, Information & Computational Sciences, The James Hutton Institute.
+All rights reserved.
 
-   The licence and copyright for Tablet is as follows:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-   Copyright © 2009-2013, Information & Computational Sciences, JHI.
-   All rights reserved.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-   Redistribution and use in binary form, without modification, is
-   permitted provided that the following conditions are met:
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-   - Redistributions must reproduce the above copyright notice, this list
-   of conditions and the following disclaimer in the documentation and/or
-   other materials provided with the distribution.
-   - Neither the name of The James Hutton Institute nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-References
-
-   1. http://opensource.org/licenses/bsd-license.html
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.