public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:fixing commit in: licenses/
@ 2013-06-16 11:31 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7605fb07c3f62f67cfa825efcc3763be576a8815
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:16:56 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:16:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7605fb07

tablet's modified for of BSD license
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 licenses/BSD-tablet | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/licenses/BSD-tablet b/licenses/BSD-tablet
new file mode 100644
index 0000000..0816456
--- /dev/null
+++ b/licenses/BSD-tablet
@@ -0,0 +1,37 @@
+   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.
+
+   The licence and copyright for Tablet is as follows:
+
+   Copyright © 2009-2013, Information & Computational Sciences, JHI.
+   All rights reserved.
+
+   Redistribution and use in binary form, without modification, is
+   permitted provided that the following conditions are met:
+
+   - 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
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:fixing commit in: licenses/
@ 2013-06-16 11:31 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb55f96548b50f69d3d99394a0196eb30b0a369
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:18:07 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:18:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eeb55f96

Drop the license again
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 licenses/BSD-tablet | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/licenses/BSD-tablet b/licenses/BSD-tablet
deleted file mode 100644
index 0816456..0000000
--- a/licenses/BSD-tablet
+++ /dev/null
@@ -1,37 +0,0 @@
-   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.
-
-   The licence and copyright for Tablet is as follows:
-
-   Copyright © 2009-2013, Information & Computational Sciences, JHI.
-   All rights reserved.
-
-   Redistribution and use in binary form, without modification, is
-   permitted provided that the following conditions are met:
-
-   - 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
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:fixing commit in: licenses/
@ 2013-06-16 11:31 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c4d8cbb598e3797c72008c3e8ea4171960ab2dbd
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 11:27:14 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 11:27:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c4d8cbb5

New license
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 licenses/GRL | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/licenses/GRL b/licenses/GRL
new file mode 100644
index 0000000..8a897b7
--- /dev/null
+++ b/licenses/GRL
@@ -0,0 +1,15 @@
+This software has been created by Genome Research Limited (GRL). 
+GRL hereby grants permission to use, copy, modify and distribute 
+this software and its documentation for non-commercial purposes 
+without fee at the user's own risk on the basis set out below.
+GRL neither undertakes nor accepts any duty whether contractual or 
+otherwise in connection with the software, its use or the use of 
+any derivative, and makes no representations or warranties, express
+or implied, concerning the software, its suitability, fitness for
+a particular purpose or non-infringement.
+In no event shall the authors of the software or GRL be 
+responsible or liable for any loss or damage whatsoever arising in
+any way directly or indirectly out of the use of this software or 
+ its derivatives, even if advised of the possibility of such damage.
+Our software can be freely distributed under the conditions set 
+out above, and must contain this copyright notice.
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/sci:fixing commit in: licenses/
@ 2013-06-16 11:31 Justin Lecher
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d9ae63e6be42d190d8627d24317054b88b59792f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 11:29:43 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 11:29:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9ae63e6

Update license
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 licenses/Tablet | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/licenses/Tablet b/licenses/Tablet
index 984a28b..d81931a 100644
--- a/licenses/Tablet
+++ b/licenses/Tablet
@@ -6,7 +6,7 @@
 
    The licence and copyright for Tablet is as follows:
 
-   Copyright © 2009-2010, Plant Bioinformatics Group, SCRI
+   Copyright © 2009-2013, Information & Computational Sciences, JHI.
    All rights reserved.
 
    Redistribution and use in binary form, without modification, is
@@ -15,9 +15,9 @@
    - 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 SCRI nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
+   - 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-06-16 11:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-16 11:31 [gentoo-commits] proj/sci:fixing commit in: licenses/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2013-06-16 11:31 Justin Lecher
2013-06-16 11:31 Justin Lecher
2013-06-16 11:31 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox