From 6856ace01eb3708bc076bb6e71ee34b6f96e5066 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 30 Oct 2007 00:58:15 +0000
Subject: [PATCH] Changed New BSD License to "dibi license"

---
 dibi/dibi.php                    | 24 ++++-----
 dibi/drivers/mysql.php           | 17 ++++--
 dibi/drivers/mysqli.php          | 17 ++++--
 dibi/drivers/odbc.php            | 17 ++++--
 dibi/drivers/postgre.php         | 17 ++++--
 dibi/drivers/sqlite.php          | 17 ++++--
 dibi/drivers/untested/mssql.php  | 17 ++++--
 dibi/drivers/untested/oracle.php | 17 ++++--
 dibi/drivers/untested/pdo.php    | 17 ++++--
 dibi/libs/driver.php             | 17 ++++--
 dibi/libs/exception.php          | 18 +++++--
 dibi/libs/logger.php             | 18 +++++--
 dibi/libs/resultset.php          | 18 +++++--
 dibi/libs/translator.php         | 17 ++++--
 license.cs.txt                   | 59 ++++++++++++++++-----
 license.txt                      | 88 ++++++++++++++++++++++----------
 16 files changed, 289 insertions(+), 106 deletions(-)

diff --git a/dibi/dibi.php b/dibi/dibi.php
index 5eb15715..b393cffa 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * dibi - Database Abstraction Layer according to dgx
- * --------------------------------------------------
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
  *
- * for PHP 5.0.3 and newer
- *
- * This source file is subject to the new BSD license that is bundled
+ * This source file is subject to the "dibi license" that is bundled
  * with this package in the file license.txt.
  *
+ * For more information please see http://php7.org/dibi/
+ *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @version    0.9a (Revision: $WCREV$, Date: $WCDATE$)
  * @category   Database
  * @package    Dibi
@@ -21,13 +21,6 @@
  */
 
 
-/**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
- *
- * @version    $Revision$ $Date$
- */
-
-
 if (version_compare(PHP_VERSION , '5.0.3', '<')) {
     die('dibi needs PHP 5.0.3 or newer');
 }
@@ -69,6 +62,7 @@ interface DibiVariableInterface
  * This class is static container class for creating DB objects and
  * store connections info.
  *
+ * @version $Revision$ $Date$
  */
 class dibi
 {
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index d44564e4..bbe20d60 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for MySQL database
  *
+ * @version $Revision$ $Date$
  */
 class DibiMySqlDriver extends DibiDriver
 {
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 597fb23b..3fd66e03 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for MySQLi database
  *
+ * @version $Revision$ $Date$
  */
 class DibiMySqliDriver extends DibiDriver
 {
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 6216ef4c..d10e0457 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver interacting with databases via ODBC connections
  *
+ * @version $Revision$ $Date$
  */
 class DibiOdbcDriver extends DibiDriver
 {
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index 51decb16..b11d0721 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for PostgreSql database
  *
+ * @version $Revision$ $Date$
  */
 class DibiPostgreDriver extends DibiDriver
 {
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 72d1b146..144dfc4e 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for SQlite database
  *
+ * @version $Revision$ $Date$
  */
 class DibiSqliteDriver extends DibiDriver
 {
diff --git a/dibi/drivers/untested/mssql.php b/dibi/drivers/untested/mssql.php
index b00a7cea..068d8bea 100644
--- a/dibi/drivers/untested/mssql.php
+++ b/dibi/drivers/untested/mssql.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for MS SQL database
  *
+ * @version $Revision$ $Date$
  */
 class DibiMsSqlDriver extends DibiDriver
 {
diff --git a/dibi/drivers/untested/oracle.php b/dibi/drivers/untested/oracle.php
index 3cd308a7..b0cbca49 100644
--- a/dibi/drivers/untested/oracle.php
+++ b/dibi/drivers/untested/oracle.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for Oracle database
  *
+ * @version $Revision$ $Date$
  */
 class DibiOracleDriver extends DibiDriver
 {
diff --git a/dibi/drivers/untested/pdo.php b/dibi/drivers/untested/pdo.php
index cf06d89c..df583626 100644
--- a/dibi/drivers/untested/pdo.php
+++ b/dibi/drivers/untested/pdo.php
@@ -1,20 +1,29 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 /**
  * The dibi driver for PDO
  *
+ * @version $Revision$ $Date$
  */
 class DibiPdoDriver extends DibiDriver
 {
diff --git a/dibi/libs/driver.php b/dibi/libs/driver.php
index f903a533..f20bbf2f 100644
--- a/dibi/libs/driver.php
+++ b/dibi/libs/driver.php
@@ -1,14 +1,22 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
@@ -16,6 +24,7 @@
 /**
  * dibi Common Driver
  *
+ * @version $Revision$ $Date$
  */
 abstract class DibiDriver
 {
diff --git a/dibi/libs/exception.php b/dibi/libs/exception.php
index 6ac69f52..efd830f0 100644
--- a/dibi/libs/exception.php
+++ b/dibi/libs/exception.php
@@ -1,20 +1,30 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 
 /**
  * dibi common exception
+ *
+ * @version $Revision$ $Date$
  */
 class DibiException extends Exception
 {
diff --git a/dibi/libs/logger.php b/dibi/libs/logger.php
index 01f412b5..8954594e 100644
--- a/dibi/libs/logger.php
+++ b/dibi/libs/logger.php
@@ -1,20 +1,30 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
 
 /**
  * dibi basic logger & profiler
+ *
+ * @version $Revision$ $Date$
  */
 final class DibiLogger
 {
diff --git a/dibi/libs/resultset.php b/dibi/libs/resultset.php
index 1e9a0ed1..aa23e2ae 100644
--- a/dibi/libs/resultset.php
+++ b/dibi/libs/resultset.php
@@ -1,14 +1,22 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
@@ -34,6 +42,8 @@ if (!interface_exists('Countable', FALSE)) {
  * $assoc = $result->fetchAssoc('active', 'id');
  * unset($result);
  * </code>
+ *
+ * @version $Revision$ $Date$
  */
 abstract class DibiResult implements IteratorAggregate, Countable
 {
diff --git a/dibi/libs/translator.php b/dibi/libs/translator.php
index 7946c8aa..8ac48343 100644
--- a/dibi/libs/translator.php
+++ b/dibi/libs/translator.php
@@ -1,14 +1,22 @@
 <?php
 
 /**
- * This file is part of the "dibi" project (http://php7.org/dibi/)
+ * dibi - tiny'n'smart database abstraction layer
+ * ----------------------------------------------
+ *
+ * Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ *
+ * This source file is subject to the "dibi license" that is bundled
+ * with this package in the file license.txt.
+ *
+ * For more information please see http://php7.org/dibi/
  *
  * @author     David Grudl
- * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- * @license    New BSD License
- * @version    $Revision$ $Date$
+ * @copyright  Copyright (c) 2005, 2007 David Grudl
+ * @license    http://php7.org/dibi/license  (dibi license)
  * @category   Database
  * @package    Dibi
+ * @link       http://php7.org/dibi/
  */
 
 
@@ -16,6 +24,7 @@
 /**
  * dibi translator
  *
+ * @version $Revision$ $Date$
  */
 final class DibiTranslator
 {
diff --git a/license.cs.txt b/license.cs.txt
index e5ba7893..62d66125 100644
--- a/license.cs.txt
+++ b/license.cs.txt
@@ -1,26 +1,61 @@
 ----------------------------------------------------------------------------------
-Tento text je NEOFICIÁLNÍM překladem NEW BSD LICENSE. Nevyjadřuje právní podstatu
+Tento text je NEOFICIÁLNÍM překladem "dibi license". Nevyjadřuje právní podstatu
 podmínek pro šíření tohoto softwaru - k tomuto účelu slouží výhradně původní
 anglická verze licence.
 ----------------------------------------------------------------------------------
 
 
-Copyright (c) 2005-2007, David Grudl (http://www.dgx.cz)
+The Dibi Licence, Version 1.0
+=============================
+
+Copyright (c) 2005, 2007 David Grudl (http://www.dgx.cz)
 Všechna práva vyhrazena.
 
-Redistribuce a použití zdrojových i binárních forem díla, v původním i upravovaném
-tvaru, jsou povoleny za následujících podmínek:
+Tato licence je právní ujednání mezi vámi a Davidem Grudlem pro potřeby
+použití "dibi" (dále "Software"). By obtaining the Software you agree to comply
+with the terms and conditions of this license.
 
-    * Šířený zdrojový kód musí obsahovat výše uvedenou informaci o copyrightu,
-      tento seznam podmínek a níže uvedené zřeknutí se odpovědnosti.
 
-    * Šířený binární tvar musí nést výše uvedenou informaci o copyrightu,
-      tento seznam podmínek a níže uvedené zřeknutí se odpovědnosti ve své
-      dokumentaci a/nebo dalších poskytovaných materiálech.
+POVOLENÉ POUŽITÍ
+----------------
 
-    * Ani jméno Davida Grudla, ani jména přispěvatelů nemohou být použita
-      při podpoře nebo právních aktech souvisejících s produkty odvozenými
-      z tohoto software bez výslovného písemného povolení.
+Můžete používat, kopírovat, modifikovat a distribuovat Software a jeho
+dokumentaci, v původním i upravovaném tvaru, k jakémukoliv účelu, a to
+za následujících podmínek:
+
+1. Kopie tohoto licenčního ujednání musí být přiložena v distribuci.
+
+2. Šířený zdrojový kód musí obsahovat výše uvedenou informaci o copyrightu
+   ve všech souborech zdrojového kódu.
+
+3. Šířený binární tvar musí nést výše uvedenou informaci o copyrightu ve své
+   dokumentaci a/nebo dalších materiálech poskytovaných s distribucí.
+
+4. Produkty odvozené od tohoto Software musí ve své dokumentaci a/nebo
+   dalších materiálech poskytovaných s distribucí obsahovat zmínku, že jsou
+   odvozené od "dibi".
+
+5. Název "dibi" nesmí být použit při podpoře nebo právních aktech
+   souvisejících s produkty odvozenými z tohoto Software bez předchozího
+   písemného souhlasu Davida Grudla.
+
+6. Produkty odvozené od tohoto Software nesmí být nazvány "dibi",
+   ani se nesmí "dibi" objevovat v jejich názvu bez předchozího
+   písemného souhlasu Davida Grudla.
+
+
+INDEMNITY
+---------
+
+You agree to indemnify and hold harmless the authors of the Software and
+any contributors for any direct, indirect, incidental, or consequential
+third-party claims, actions or suits, as well as any related expenses,
+liabilities, damages, settlements or fees arising from your use or misuse
+of the Software, or a violation of any terms of this license.
+
+
+ZÁRUKA SE NEPOSKYTUJE
+---------------------
 
 TENTO SOFTWARE JE POSKYTOVÁN DRŽITELEM LICENCE A JEHO PŘISPĚVATELI "JAK STOJÍ A LEŽÍ"
 A JAKÉKOLIV VÝSLOVNÉ NEBO PŘEDPOKLÁDANÉ ZÁRUKY VČETNĚ, ALE NEJEN, PŘEDPOKLÁDANÝCH
diff --git a/license.txt b/license.txt
index f2add78c..a18ac661 100644
--- a/license.txt
+++ b/license.txt
@@ -1,27 +1,61 @@
-Copyright (c) 2005-2007, David Grudl (http://www.dgx.cz)
-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 David Grudl 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 HOLDER "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 HOLDER 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.
+The Dibi Licence, Version 1.0
+=============================
+
+Copyright (c) 2005, 2007 David Grudl (http://www.dgx.cz)
+All rights reserved.
+
+This license is a legal agreement between you and David Grudl for the use
+of "dibi" (the "Software"). By obtaining the Software you agree to comply
+with the terms and conditions of this license.
+
+
+PERMITTED USE
+-------------
+
+You are permitted to use, copy, modify, and distribute the Software and its
+documentation, with or without modification, for any purpose, provided that
+the following conditions are met:
+
+1. A copy of this license agreement must be included with the distribution.
+
+2. Redistributions of source code must retain the above copyright notice in
+   all source code files.
+
+3. Redistributions in binary form must reproduce the above copyright notice
+   in the documentation and/or other materials provided with the distribution.
+
+4. Products derived from the Software must include an acknowledgment that
+   they are derived from "dibi" in their documentation and/or other
+   materials provided with the distribution.
+
+5. The name "dibi" must not be used to endorse or promote products derived
+   from the Software without prior written permission from David Grudl.
+
+6. Products derived from the Software may not be called "dibi",
+   nor may "dibi" appear in their name, without prior written
+   permission from David Grudl.
+
+
+INDEMNITY
+---------
+
+You agree to indemnify and hold harmless the authors of the Software and
+any contributors for any direct, indirect, incidental, or consequential
+third-party claims, actions or suits, as well as any related expenses,
+liabilities, damages, settlements or fees arising from your use or misuse
+of the Software, or a violation of any terms of this license.
+
+
+DISCLAIMER OF WARRANTY
+----------------------
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "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 HOLDER 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.