Changed license to 'Revised BSD License'.

diff --git a/LICENSE b/LICENSE
index d85ac0b..2bfc683 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,25 +1,25 @@
-Copyright (c) 1998-2006, Index Data and Mike Taylor.
+Copyright (c) 1999-2006, Index Data and Mike Taylor
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:

 
 

-Permission to use, copy, modify, distribute, and sell this software and
-its documentation, in whole or in part, for any purpose, is hereby granted,
-provided that:
-
-1. This copyright and permission notice appear in all copies of the
-software and its documentation. Notices of copyright or attribution
-which appear at the beginning of any file must remain unchanged.
-
-2. The names of Index Data or the individual authors may not be used to
-endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
-NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Index Data 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 REGENTS 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 REGENTS AND 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.

 
 

diff --git a/NEWS b/NEWS
index cfa2ce2..b9da405 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Change wording of YAZ++ license to the 'Revised BSD License'.
+

 Added assignment operator for class Yaz_Z_Query.
 
 --- 1.0.0 2006/05/01
 Added assignment operator for class Yaz_Z_Query.
 
 --- 1.0.0 2006/05/01

diff --git a/doc/license.xml b/doc/license.xml
index bb7a6c8..659d827 100644 (file)
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,41 +1,57 @@
-<!-- $Id: license.xml,v 1.8 2006-04-25 12:37:05 marc Exp $ -->
+<!-- $Id: license.xml,v 1.9 2006-10-10 13:37:36 adam Exp $ -->

  <appendix id="license"><title>License</title>
   
   <section id="yaz.license"><title>YAZ License</title>
  <appendix id="license"><title>License</title>
   
   <section id="yaz.license"><title>YAZ License</title>

-   
+

    <para>
    <para>

-    Copyright &copy; 1999-2006 Index Data Aps and Mike Taylor.
+    Copyright &copy; 1999-2006, Index Data and Mike Taylor.

    </para>
    </para>

-   

    <para>
    <para>

-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation, in whole or in part, for any
-    purpose, is hereby granted, provided that:
+    All rights reserved.

    </para>
    </para>

-   
+

    <para>
    <para>

-    1. This copyright and permission notice appear in all copies of the
-    software and its documentation. Notices of copyright or attribution
-    which appear at the beginning of any file must remain unchanged.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:

    </para>
    </para>

+
+   <itemizedlist>
+    <listitem>
+     <para>
+      Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      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.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Neither the name of Index Data nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+      </para>
+    </listitem>
+   </itemizedlist>

    
    <para>
    
    <para>

-    2. The names of Index Data or the individual authors may not be used to
-    endorse or promote products derived from this software without specific
-    prior written permission.
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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.

    </para>
    
    </para>
    

-   <para>
-    THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-    IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-    INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
-    NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-    OF THIS SOFTWARE.
-   </para>

   </section>
  </appendix>
  
   </section>
  </appendix>