License change for psycopg2da

LGPL3+ZPL is fine for me, thanks.

Fabio

3 files changed, 42 insertions, 34 deletions

diff --git a/psycopg2.cproj b/psycopg2.cproj
index 4328a3e..8445c45 100644
--- a/psycopg2.cproj
+++ b/psycopg2.cproj
@@ -139,6 +139,15 @@
     <None Include="sandbox\test_isready_connection_closed.py" />
     <None Include="psycopg\adapter_pfloat.h" />
     <None Include="README.async" />
+    <None Include="psycopg2da\adapter.py" />
+    <None Include="psycopg2da\configure.zcml" />
+    <None Include="psycopg2da\DEPENDENCIES.cfg" />
+    <None Include="psycopg2da\__init__.py" />
+    <None Include="psycopg2da\PACKAGE.cfg" />
+    <None Include="psycopg2da\psycopg2da-configure.zcml" />
+    <None Include="psycopg2da\PUBLICATION.cfg" />
+    <None Include="psycopg2da\README.txt" />
+    <None Include="psycopg2da\tests.py" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="psycopg\adapter_asis.c" />
diff --git a/psycopg2da/adapter.py b/psycopg2da/adapter.py
index 68b3a42..2ddc0a2 100644
--- a/psycopg2da/adapter.py
+++ b/psycopg2da/adapter.py
@@ -1,35 +1,28 @@
-# psycopg2da
 # Copyright (C) 2006 Fabio Tranchitella <fabio@tranchitella.it>
 #
-# Based on psycopgda:
-#
-#   Copyright (c) 2002-2006 Zope Corporation and Contributors.
-#   All Rights Reserved.
+# psycopg2da is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#   This software is subject to the provisions of the Zope Public License,
-#   Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-#   THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-#   WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-#   WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-#   FOR A PARTICULAR PURPOSE.
+# In addition, as a special exception, the copyright holders give
+# permission to link this program with the OpenSSL library (or with
+# modified versions of OpenSSL that use the same license as OpenSSL),
+# and distribute linked combinations including the two.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# You must obey the GNU Lesser General Public License in all respects for
+# all of the code used other than OpenSSL.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# psycopg2da is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Based on ZPsycopgDA.
 #
 # If you prefer you can use this package using the ZPL license as
 # published on the Zope web site, http://www.zope.org/Resources/ZPL.
-#
+
 """PostgreSQL Database Adapter for Zope 3"""
 
 from zope.interface import implements
diff --git a/psycopg2da/tests.py b/psycopg2da/tests.py
index 4a75f4e..f8620cb 100644
--- a/psycopg2da/tests.py
+++ b/psycopg2da/tests.py
@@ -1,20 +1,26 @@
-# psycopg2da
 # Copyright (C) 2006 Fabio Tranchitella <fabio@tranchitella.it>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# psycopg2da is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# In addition, as a special exception, the copyright holders give
+# permission to link this program with the OpenSSL library (or with
+# modified versions of OpenSSL that use the same license as OpenSSL),
+# and distribute linked combinations including the two.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You must obey the GNU Lesser General Public License in all respects for
+# all of the code used other than OpenSSL.
 #
+# psycopg2da is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# If you prefer you can use this package using the ZPL license as
+# published on the Zope web site, http://www.zope.org/Resources/ZPL.
+
 """Unit tests for Psycopg2DA."""
 
 from unittest import TestCase, TestSuite, main, makeSuite