Change license from BSD like to PostgreSQL license

diff --git a/LICENSE b/LICENSE
index a70d11ad6a4260495e89dd51de1f69039b411536..748cad7522e5ba1876e2cba2626fe7ff236f8377 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,26 +1,17 @@
-This collective work is Copyright (c)2012 by Gilles Darold
-Individual portions may be copyright by individual contributors, and
-are included in this collective work with permission of the copyright
-owners.
-All rights reserved.
+Copyright (c) 2012, Dalibo
 
-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, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement
+is hereby granted, provided that the above copyright notice and this
+paragraph and the following two paragraphs appear in all copies.
 
-  * 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.
-
-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.
+IN NO EVENT SHALL Dalibo BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+Dalibo HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Dalibo SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND Dalibo
+HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
+OR MODIFICATIONS.

diff --git a/doc/pgBadger.pod b/doc/pgBadger.pod
index 50dcde974e7f3186a4e9961babb63ea0c64a7090..b1735834fb6cc7cb3dd58937f6408b31150561c0 100644 (file)
--- a/doc/pgBadger.pod
+++ b/doc/pgBadger.pod
@@ -201,5 +201,5 @@ pgBadger is an original work from Gilles Darold. It is maintained by the good fo
 
 =head1 LICENSE
 
-pgBadger is free software distributed under the simplified BSD License.
+pgBadger is free software distributed under the PostgreSQL Licence.
 

diff --git a/pgbadger b/pgbadger
index 6eff652bb7326f3a00a1c49e379d0f7dd9fceb21..44569d15d8aeb17e56307d7f7b009bcde39fb65a 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -4,7 +4,7 @@
 # PgBadger - An other PostgreSQL log analyzer that aims to replace and
 #           outperforms pgFouine
 #
-# This program is open source, licensed under the simplified BSD license.
+# This program is open source, licensed under the PostgreSQL Licence.
 # For license terms, see the LICENSE file.
 #------------------------------------------------------------------------------
 #