[arch-commits] Commit in python-apsw/trunk (LICENSE)

[Jelle van der Waa]

    Date: Monday, January 12, 2015 @ 09:08:27
  Author: jelle
Revision: 125790

Update LICENSE

Modified:
  python-apsw/trunk/LICENSE

---------+
 LICENSE |   32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

Modified: LICENSE
===================================================================
--- LICENSE	2015-01-12 04:46:55 UTC (rev 125789)
+++ LICENSE	2015-01-12 08:08:27 UTC (rev 125790)
@@ -1,15 +1,27 @@
-Copyright (C) 2004-2009 Roger Binns
+Copyright (c) 2004-2014 Roger Binns <rogerb at rogerbinns.com>
+See src/traceback.c for code by Greg Ewing.
 
-This software is provided ‘as-is’, without any express or implied warranty. In no event will the authors be held liable
-for any damages arising from the use of this software.
+All code and documentation is provided under this license:
 
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it
-and redistribute it freely, subject to the following restrictions: 
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-- The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If
-  you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not
-  required.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-- Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
 
-- This notice may not be removed or altered from any source distribution.
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+
+Alternatively you may strike the license above and use it under any
+OSI approved open source license such as those listed at
+http://opensource.org/licenses/alphabetical