License changed to the New BSD License or the GNU General Public License (GPL) version 2 or 3.

dibi/dibi.php

@@ -1,12 +1,13 @@
 <?php
 
 /**
- * dibi - smart database abstraction layer.
+ * dibi - smart database abstraction layer (http://dibiphp.com)
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/drivers/firebird.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/mssql.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/mssql2005.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/mysql.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/mysql.reflector.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/mysqli.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/odbc.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/oracle.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/pdo.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/postgre.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/sqlite.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/sqlite.reflector.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/drivers/sqlite3.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi\drivers
  */
 

dibi/libs/DibiConnection.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiDataSource.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiDatabaseInfo.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiDateTime.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiException.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiFluent.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiHashMap.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiObject.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiProfiler.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiResult.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiResultIterator.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiRow.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/DibiTranslator.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

dibi/libs/interfaces.php

@@ -5,8 +5,9 @@
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license", and/or
+ * For the full copyright and license information, please view
- * GPL license. For more information please see http://dibiphp.com
+ * the file license.txt that was distributed with this source code.
+ *
  * @package    dibi
  */
 

license.txt

@@ -1,62 +1,60 @@
-The Dibi License, Version 1
+Licenses
-============================
+========
 
-Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
+Good news! You may use Dibi under the terms of either the New BSD License
+or the GNU General Public License (GPL) version 2 or 3.
+
+The BSD License is recommended for most projects. It's easy to understand, and it
+places almost no restrictions on what you can do with the library. If the GPL
+fits better to your project, you can use the Dibi under this license.
+
+You don't have anyone to notify which license you are using. You can freely
+use Dibi in commercial projects as long as the copyright header
+remains intact.
+
+Please, do not use "Dibi" in the name of your project or top-level domain,
+and choose a name that stands on its own merits. If your stuff is good,
+it will not take long to establish a reputation for yourselves.
+
+
+
+New BSD License
+---------------
+
+Copyright (c) 2005, 2011 David Grudl (http://davidgrudl.com)
 All rights reserved.
 
-This license is a legal agreement between you and David Grudl (the "Author")
+Redistribution and use in source and binary forms, with or without modification,
-for the use of "dibi" (the "Software"). By obtaining, using and/or
+are permitted provided that the following conditions are met:
-copying the Software, you agree that you have read, understood, and will
-comply with the terms and conditions of this license.
 
+	* Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
 
-PERMITTED USE
+	* 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.
 
-You are permitted to use, copy, modify, and distribute the Software and its
+	* Neither the name of "Dibi" nor the names of its contributors
-documentation, with or without modification, for any purpose, provided that
+	may be used to endorse or promote products derived from this software
-the following conditions are met:
+	without specific prior written permission.
 
-1. A copy of this license agreement must be included with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-
-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 Author.
-
-6. Products derived from the Software may not be called "dibi",
-   nor may "dibi" appear in their name, without prior written
-   permission from Author.
-
-
-INDEMNITY
----------
-
-You agree to indemnify and hold harmless the Author 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
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 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.
+
+
+
+GNU General Public License
+--------------------------
+
+GPL licenses are very very long, so instead of the full text here are just some URL.
+
+- GPL version 2: http://www.gnu.org/licenses/gpl-2.0.html
+- GPL version 3: http://www.gnu.org/licenses/gpl-3.0.html

readme.txt

@@ -1,7 +1,3 @@
-Dibi (c) David Grudl, 2005-2010 (http://davidgrudl.com)
-
-
-
 Introduction
 ------------
 
@@ -10,10 +6,6 @@ Thank you for downloading Dibi!
 Database access functions in PHP are not standardised. This is class library
 to hide the differences between the different databases access.
 
-The files in this archive are released under the Dibi license.
-See license.txt in this directory for a copy of the license.
-
-
 
 Documentation and Examples
 --------------------------
@@ -24,7 +16,6 @@ available on the homepage:
 http://dibiphp.com
 
 
-
 Dibi.minified
 -------------
 
@@ -35,7 +26,6 @@ This is exactly the same as normal version, just only comments and
 whitespaces are removed.
 
 
-
 -----
 For more information, visit the author's weblog (in czech language):
 http://phpfashion.com