Update library's license to GPLv2+classpath exception

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d57f84b..eca1782 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - [#8] Support -# --fast --best option in CLI.
 
 ### Changed
+- [#3] License changed to GPL2++classpath(lib) exception and GPL3(CLI)
 - We have now dictzip-lib and dictzip-cli subprojects.
 - Target jars become dictzip-lib.jar and dictzip-cli.jar
 - [#2] Now this is a Gradle project.

diff --git a/README.md b/README.md
index e3dfd69..b62669b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -61,4 +61,25 @@ DictZip command line utility is distributed under the terms of GNU General
 Public License Version 3 or (at your option) any later version.
 
 DictZip library is distributed under the terms of the GNU General Public License
-Version 2 or (at your option) any later version.
+Version 2 or (at your option) any later version with the following clarification
+and special exception as same as GNU classpath.
+
+Linking this library statically or dynamically with other modules is making
+a combined work based on this library. Thus, the terms and conditions of
+the GNU General Public License cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission
+to link this library with independent modules to produce an executable, regardless
+of the license terms of these independent modules, and to copy and distribute
+the resulting executable under terms of your choice, provided that you also meet,
+for each linked independent module, the terms and conditions of the license of
+that module. An independent module is a module which is not derived from or based on
+this library. If you modify this library, you may extend this exception to
+your version of the library, but you are not obligated to do so. If you do not wish
+to do so, delete this exception statement from your version.
+
+As such, it can be used to run, create and distribute a large class of applications
+and applets. When GNU Classpath is used unmodified as the core class library
+for a virtual machine, compiler for the java languge, or for a program written
+in the java programming language it does not affect the licensing for distributing
+those programs directly.

diff --git a/dictzip-cli/src/main/resources/org/dict/zip/Version.properties b/dictzip-cli/src/main/resources/org/dict/zip/Version.properties
index eeb6389..19399e0 100644 (file)
--- a/dictzip-cli/src/main/resources/org/dict/zip/Version.properties
+++ b/dictzip-cli/src/main/resources/org/dict/zip/Version.properties
@@ -14,6 +14,23 @@
 # * 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.
+# *
+# * Linking this library statically or dynamically with other modules is
+# * making a combined work based on this library.  Thus, the terms and
+# * conditions of the GNU General Public License cover the whole
+# * combination.
+# *
+# * As a special exception, the copyright holders of this library give you
+# * permission to link this library with independent modules to produce an
+# * executable, regardless of the license terms of these independent
+# * modules, and to copy and distribute the resulting executable under
+# * terms of your choice, provided that you also meet, for each linked
+# * independent module, the terms and conditions of the license of that
+# * module.  An independent module is a module which is not derived from
+# * or based on this library.  If you modify this library, you may extend
+# * this exception to your version of the library, but you are not
+# * obligated to do so.  If you do not wish to do so, delete this
+# * exception statement from your version.
 # */
 
 version=0.5

diff --git a/dictzip-lib/src/main/java/org/dict/zip/DictZipHeader.java b/dictzip-lib/src/main/java/org/dict/zip/DictZipHeader.java
index 7c70599..98597e6 100644 (file)
--- a/dictzip-lib/src/main/java/org/dict/zip/DictZipHeader.java
+++ b/dictzip-lib/src/main/java/org/dict/zip/DictZipHeader.java
@@ -17,6 +17,23 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 
 package org.dict.zip;

diff --git a/dictzip-lib/src/main/java/org/dict/zip/DictZipOutputStream.java b/dictzip-lib/src/main/java/org/dict/zip/DictZipOutputStream.java
index 52d69a7..73c3c78 100644 (file)
--- a/dictzip-lib/src/main/java/org/dict/zip/DictZipOutputStream.java
+++ b/dictzip-lib/src/main/java/org/dict/zip/DictZipOutputStream.java
@@ -16,6 +16,23 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 
 package org.dict.zip;

diff --git a/dictzip-lib/src/main/java/org/dict/zip/RandomAccessOutputStream.java b/dictzip-lib/src/main/java/org/dict/zip/RandomAccessOutputStream.java
index 331284b..aa11d1a 100644 (file)
--- a/dictzip-lib/src/main/java/org/dict/zip/RandomAccessOutputStream.java
+++ b/dictzip-lib/src/main/java/org/dict/zip/RandomAccessOutputStream.java
@@ -16,7 +16,25 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
+
 package org.dict.zip;
 
 import java.io.IOException;

diff --git a/dictzip-lib/src/test/java/org/dict/zip/DictZipHeaderTest.java b/dictzip-lib/src/test/java/org/dict/zip/DictZipHeaderTest.java
index 4b68792..787d5a2 100644 (file)
--- a/dictzip-lib/src/test/java/org/dict/zip/DictZipHeaderTest.java
+++ b/dictzip-lib/src/test/java/org/dict/zip/DictZipHeaderTest.java
@@ -16,6 +16,23 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 package org.dict.zip;
 

diff --git a/dictzip-lib/src/test/java/org/dict/zip/DictZipInputStreamTest.java b/dictzip-lib/src/test/java/org/dict/zip/DictZipInputStreamTest.java
index 52bc340..766233c 100644 (file)
--- a/dictzip-lib/src/test/java/org/dict/zip/DictZipInputStreamTest.java
+++ b/dictzip-lib/src/test/java/org/dict/zip/DictZipInputStreamTest.java
@@ -16,6 +16,23 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 
 package org.dict.zip;

diff --git a/dictzip-lib/src/test/java/org/dict/zip/DictZipOutputStreamTest.java b/dictzip-lib/src/test/java/org/dict/zip/DictZipOutputStreamTest.java
index 041072a..0e54b4c 100644 (file)
--- a/dictzip-lib/src/test/java/org/dict/zip/DictZipOutputStreamTest.java
+++ b/dictzip-lib/src/test/java/org/dict/zip/DictZipOutputStreamTest.java
@@ -16,6 +16,23 @@
  * 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.
+  *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 
 package org.dict.zip;

diff --git a/dictzip-lib/src/test/java/org/dict/zip/RandomAccessInputStreamTest.java b/dictzip-lib/src/test/java/org/dict/zip/RandomAccessInputStreamTest.java
index 29d192b..51323a1 100644 (file)
--- a/dictzip-lib/src/test/java/org/dict/zip/RandomAccessInputStreamTest.java
+++ b/dictzip-lib/src/test/java/org/dict/zip/RandomAccessInputStreamTest.java
@@ -16,6 +16,23 @@
  * 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.
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
  */
 
 package org.dict.zip;