Be consistent about license: revised BSD license

This is same license as YAZ.

diff --git a/GRS1.pm b/GRS1.pm
index 9862193..adc8bba 100644 (file)
--- a/GRS1.pm
+++ b/GRS1.pm
@@ -1,38 +1,35 @@
-package Net::Z3950::GRS1;
-
-##  $Id: GRS1.pm,v 1.6 2004-05-28 20:14:28 sondberg Exp $
-##
-##  Copyright (c) 2000-2004, Index Data.
-##
-##  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.
+## This file is part of simpleserver
+## Copyright (C) 2000-2011 Index Data.
+## All rights reserved.
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:

 ##
 ##

-##  2. The name 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.
+
+package Net::Z3950::GRS1;

 
 use strict;
 use IO::Handle;
 use Carp;
 
 
 use strict;
 use IO::Handle;
 use Carp;
 

-
-

 sub new {
        my ($class, $href, $map) = @_;
        my $self = {};
 sub new {
        my ($class, $href, $map) = @_;
        my $self = {};

diff --git a/INSTALL b/INSTALL
index c64a63f..50c0c9f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,18 +1,15 @@
 Building and installation
 -------------------------
 Building and installation
 -------------------------

-
-

 1. Requirements
 
 1. Requirements
 

-The Net::Z3950::SimpleServer Perl module requires the YAZ toolkit: the
-development version 1.7 or any subsequent version is fine. You can
-download it via this link,
+The Net::Z3950::SimpleServer Perl module requires the YAZ toolkit.
+Version 4 or later is recommended. You can download it via this link:

 
 

-       http://ftp.indexdata.dk/pub/yaz/development/
+       http://ftp.indexdata.dk/pub/yaz/

 
 You need to configure the YAZ toolkit with the command
 
 
 You need to configure the YAZ toolkit with the command
 

-       % ./configure --enable-shared
+       % ./configure

 
 Then compile and install
 
 
 Then compile and install
 

@@ -45,8 +42,3 @@ The last command has to be issued as super user.
 
 Good luck!
 
 
 Good luck!
 

-Anders Sønderberg <sondberg@indexdata.dk>
-http://www.indexdata.dk/
-
-
-

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..b219c01
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2000-2011, Index Data
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * 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/MANIFEST b/MANIFEST
index cf543c9..5783612 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,6 +1,7 @@
 Changes
 GRS1.pm
 INSTALL
 Changes
 GRS1.pm
 INSTALL

+LICENSE

 MANIFEST
 MANIFEST.SKIP
 Makefile.PL
 MANIFEST
 MANIFEST.SKIP
 Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 264c570..cea9dab 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,5 @@
 use ExtUtils::MakeMaker;
 
 use ExtUtils::MakeMaker;
 

-## $Id: Makefile.PL,v 1.23 2009-12-29 10:24:12 adam Exp $
-

 # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement"
 
 my $yazconf = "yaz-config";
 # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement"
 
 my $yazconf = "yaz-config";

diff --git a/OID.pm b/OID.pm
index 6d6a609..749b6ab 100644 (file)
--- a/OID.pm
+++ b/OID.pm
@@ -1,3 +1,29 @@
+## This file is part of simpleserver
+## Copyright (C) 2000-2011 Index Data.
+## All rights reserved.
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:
+##
+##     * 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.
+

 package Net::Z3950::OID;
 
 my $prefix = "1.2.840.10003.5.";
 package Net::Z3950::OID;
 
 my $prefix = "1.2.840.10003.5.";

diff --git a/README b/README
index 17e045d..34ab48f 100644 (file)
--- a/README
+++ b/README
@@ -28,11 +28,7 @@ AUTHORS
 
 COPYRIGHT AND LICENCE
 
 
 COPYRIGHT AND LICENCE
 

-Copyright (C) 2000-2009 by Index Data.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.4 or,
-at your option, any later version of Perl 5 you may have available.
+See file LICENSE

 
 CONVERSION FROM CVS
 
 
 CONVERSION FROM CVS
 

diff --git a/SimpleServer.pm b/SimpleServer.pm
index 1dd4274..b3cdd48 100644 (file)
--- a/SimpleServer.pm
+++ b/SimpleServer.pm
@@ -1,31 +1,28 @@
+## This file is part of simpleserver
+## Copyright (C) 2000-2011 Index Data.
+## All rights reserved.
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:

 ##
 ##

-##  Copyright (c) 2000-2006, Index Data.
+##     * 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.

 ##
 ##

-##  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 name 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.
-##
-##
-
-## $Id: SimpleServer.pm,v 1.50 2010-02-04 16:30:40 mike Exp $
+## 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.

 
 package Net::Z3950::SimpleServer;
 
 
 package Net::Z3950::SimpleServer;
 

@@ -888,7 +885,7 @@ Mike Taylor (indexdata.com).
 
 =head1 COPYRIGHT AND LICENCE
 
 
 =head1 COPYRIGHT AND LICENCE
 

-Copyright (C) 2000-2009 by Index Data.
+Copyright (C) 2000-2011 by Index Data.

 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.4 or,
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.4 or,

diff --git a/SimpleServer.xs b/SimpleServer.xs
index fb480e6..e83f47b 100644 (file)
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,30 +1,28 @@
-/*
- * $Id: SimpleServer.xs,v 1.86 2010-02-04 16:30:20 mike Exp $ 
- * ----------------------------------------------------------------------
- * 
- * Copyright (c) 2000-2004, Index Data.
- *
- * 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.
+/* This file is part of simpleserver.
+ * Copyright (C) 2000-2011 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:

  *
  *

- * 2. The name 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.
+ *     * 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 "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.
+ * 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.

  */
 
 #include "EXTERN.h"
  */
 
 #include "EXTERN.h"

diff --git a/debian/.gitignore b/debian/.gitignore
index 0b603df..dac5e8b 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,4 +1,5 @@
 files
 files

+copyright

 libnet-z3950-simpleserver-perl
 libnet-z3950-simpleserver-perl.debhelper.log
 libnet-z3950-simpleserver-perl.substvars
 libnet-z3950-simpleserver-perl
 libnet-z3950-simpleserver-perl.debhelper.log
 libnet-z3950-simpleserver-perl.substvars

diff --git a/debian/control b/debian/control
index 2e2e5dd..e3570f8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libnet-z3950-simpleserver-perl
 Section: perl
 Priority: optional
 Source: libnet-z3950-simpleserver-perl
 Section: perl
 Priority: optional

-Build-Depends: debhelper (>= 4.0.2), libyaz4-dev, yaz
+Build-Depends: debhelper (>= 4.0.2), libyaz4-dev

 Build-Depends-Indep: perl (>= 5.8.0-7)
 Maintainer: Mike Taylor <mike@indexdata.com>
 Standards-Version: 3.6.1
 Build-Depends-Indep: perl (>= 5.8.0-7)
 Maintainer: Mike Taylor <mike@indexdata.com>
 Standards-Version: 3.6.1

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 584557e..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,14 +0,0 @@
-This is the debian package for the Net-Z3950-SimpleServer module.
-It was created by Anders Mortensen <sondberg@indexdata.dk> using dh-make-perl.
-
-Copyright (C) 2000-2009 by Index Data.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.4 or,
-at your option, any later version of Perl 5 you may have available.
-
-The upstream maintainer is: 
-
-Mike Taylor <mike@indexdata.com>
-Index Data ApS, Copenhagen, Denmark.
-2009/03/03.

diff --git a/debian/rules b/debian/rules
index f558a14..d5265ab 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
 binary-arch: build install
        dh_testdir
        dh_testroot

+       cp LICENSE debian/copyright

        dh_installdocs README TODO
        dh_installexamples 
 #      dh_installmenu
        dh_installdocs README TODO
        dh_installexamples 
 #      dh_installmenu

diff --git a/logging-server.pl b/logging-server.pl
index bc453af..419c99a 100755 (executable)
--- a/logging-server.pl
+++ b/logging-server.pl
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 

-# $Id: logging-server.pl,v 1.1 2004-09-03 11:42:35 mike Exp $
-#

 # This is just about the simplest possible SimpleServer-based Z39.50
 # server.  It exists only to log the data-structures that are handed
 # to the back-end functions, and does only enough work otherwise to
 # This is just about the simplest possible SimpleServer-based Z39.50
 # server.  It exists only to log the data-structures that are handed
 # to the back-end functions, and does only enough work otherwise to

diff --git a/ztest.pl b/ztest.pl
index ea330b0..27fd7f4 100755 (executable)
--- a/ztest.pl
+++ b/ztest.pl
@@ -1,32 +1,30 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 

-##  $Id: ztest.pl,v 1.17 2007-03-08 14:51:32 mike Exp $
-##  ------------------------------------------------------------------
+## This file is part of simpleserver
+## Copyright (C) 2000-2011 Index Data.
+## All rights reserved.
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:

 ##
 ##

-##  Copyright (c) 2000-2004, Index Data.
-##
-##  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 name 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.

 
 use ExtUtils::testlib;
 use Data::Dumper;
 
 use ExtUtils::testlib;
 use Data::Dumper;