Changed SCIM LICENSE

1 files changed, 26 insertions, 69 deletions

diff --git a/LICENSE b/LICENSE
index 4499cb5..39515cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,71 +1,28 @@
-SCIM LICENSE
+Copyright (c) 2013-2015, Andrés Martinelli <andmarti@gmail.com>
+All rights reserved.
 
-I)  There are no restrictions on distributing unmodified copies of SCIM except
-    that they must include this license text. You can also distribute
-    unmodified parts of SCIM, likewise unrestricted except that they must
-    include this license text. You are also allowed to include executables
-    that you made from the unmodified SCIM sources, plus your own usage
-    examples.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+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.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   This product includes software developed by the Andrés Martinelli
+   <andmarti@gmail.com>.
+4. Neither the name of the Andrés Martinelli nor the
+   names of other contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
 
-II) It is allowed to distribute a modified (or extended) version of SCIM,
-    including executables and/or source code, when the following four
-    conditions are met:
-    1) This license text must be included unmodified.
-    2) The modified SCIM must be distributed in one of the following four ways:
-       a) If you make changes to SCIM yourself, you must clearly describe in
-      the distribution how to contact you.  When the maintainer asks you
-      (in any way) for a copy of the modified SCIM you distributed, you
-      must make your changes, including source code, available to the
-      maintainer without fee. The maintainer reserves the right to
-      include your changes in the official version of SCIM. What the
-      maintainer will do with your changes and under what license they
-      will be distributed is negotiable. If there has been no negotiation
-      then this license, or a later version, also applies to your changes.
-        The current maintainer can be contacted at <scim.spreadsheet@gmail.com>. If this
-      changes it will be announced in appropriate places. When it is completely
-      impossible to contact the maintainer, the obligation to send him
-      your changes ceases. Once the maintainer has confirmed that he has
-      received your changes they will not have to be sent again.
-       b) If you have received a modified SCIM that was distributed as
-      mentioned under a) you are allowed to further distribute it
-      unmodified, as mentioned at I).  If you make additional changes the
-      text under a) applies to those changes.
-       c) Provide all the changes, including source code, with every copy of
-      the modified SCIM you distribute. This may be done in the form of a
-      context diff. You can choose what license to use for new code you
-      add. The changes and their license must not restrict others from
-      making their own changes to the official version of SCIM.
-       d) When you have a modified SCIM which includes changes as mentioned
-      under c), you can distribute it without the source code for the
-      changes if the following three conditions are met:
-      - The license that applies to the changes permits you to distribute
-        the changes to the SCIM maintainer without fee or restriction, and
-        permits the SCIM maintainer to include the changes in the official
-        version of SCIM without fee or restriction.
-      - You keep the changes for at least three years after last
-        distributing the corresponding modified SCIM. When the maintainer
-        or someone who you distributed the modified SCIM to asks you (in
-        any way) for the changes within this period, you must make them
-        available to him.
-      - You clearly describe in the distribution how to contact you. This
-        contact information must remain valid for at least three years
-        after last distributing the corresponding modified SCIM, or as long
-        as possible.
-    3) A message must be added, at least in the output of the ":version"
-       command and in the intro screen, such that the user of the modified SCIM
-       is able to see that it was modified.
-    4) The contact information as required under 2)a) and 2)d) must not be
-       removed or changed, except that the person himself can make
-       corrections.
-
-III) If you distribute a modified version of SCIM, you are encouraged to use
-     the SCIM license for your changes and make them available to the
-     maintainer, including the source code. The preferred way to do this is
-     by e-mail or by uploading the files to a server and e-mailing the URL.
-     If the number of changes is small (e.g., a modified Makefile) e-mailing a
-     context diff will do. The e-mail address to be used is <scim.spreadsheet@gmail.com>
-
-IV)  It is not allowed to remove this license from the distribution of the SCIM
-     sources, parts of it or from a modified version. You may use this
-     license for previous SCIM releases instead of the license that they came
-     with, at your option.
+THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''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 ANDRES MARTINELLI 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.
\ No newline at end of file