Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsliebig2007-11-09 00:56:37 -0500
committersliebig2007-11-09 00:56:37 -0500
commite3e82f13cc58fa6bde783e804fa47f08922fa649 (patch)
tree03ca2d51f6671597fd50ade3ba5e562812216638 /bundles/ie.wombat.jbdiff
parentfcea91b2f7245eed48cd1567632b3abdeaef85c6 (diff)
downloadrt.equinox.p2-e3e82f13cc58fa6bde783e804fa47f08922fa649.tar.gz
rt.equinox.p2-e3e82f13cc58fa6bde783e804fa47f08922fa649.tar.xz
rt.equinox.p2-e3e82f13cc58fa6bde783e804fa47f08922fa649.zip
fixed license issues
Diffstat (limited to 'bundles/ie.wombat.jbdiff')
-rw-r--r--bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/LICENSE.txt29
-rw-r--r--bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/README.txt15
-rw-r--r--bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/bsd-license.txt22
-rw-r--r--bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/readme-more.txt2
4 files changed, 39 insertions, 29 deletions
diff --git a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/LICENSE.txt b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/LICENSE.txt
new file mode 100644
index 000000000..8b8b4d503
--- /dev/null
+++ b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/LICENSE.txt
@@ -0,0 +1,29 @@
+/* Copyright (c) 2005, Joe Desbonnet (jdesbonnet@gmail.com).
+* Based on a direct translation of bsdiff utility by Colin Percival
+* and available at http://www.daemonology.net/bsdiff/ under the
+* same license.
+
+* 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 the <organization> 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 <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 <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.
+*/ \ No newline at end of file
diff --git a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/README.txt b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/README.txt
index 30ce0658e..82356621e 100644
--- a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/README.txt
+++ b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/README.txt
@@ -1,6 +1,6 @@
README file for JBDiff (Java Binary Diff)
-Version: 0.1
-Release date: 8 Mar 2005.
+Version: 0.1.1
+Release date: 1 Oct 2007
JBDiff (Java Binary Diff) utility is a Java translation of the bsdiff (v4.2) utility
by Colin Percival. See http://www.daemonology.net/bsdiff/
@@ -40,9 +40,12 @@ to joe@galway.net
LICENSE:
-This software is distributed under the GPL v2 license (see LICENSE.txt file in
-the distribution). If this license does not suit your needs, please contact me.
+Now available under BSD license (previously GPL).
+
+CHANGES SINCE 0.1.0 RELEASE:
+
+Change of license from GPL v2 to BSD license.
Joe Desbonnet
-joe@galway.net
-8 Mar 2005
+jdesbonnet@gmail.com
+1 Oct 2007
diff --git a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/bsd-license.txt b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/bsd-license.txt
deleted file mode 100644
index f94a2fd82..000000000
--- a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/bsd-license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Copyright (c) <YEAR>, <OWNER>
-
-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 the <ORGANIZATION> 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 HOLDERS AND CONTRIBUTORS
-"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 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.
diff --git a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/readme-more.txt b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/readme-more.txt
index 4ab91b992..5cc2e1054 100644
--- a/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/readme-more.txt
+++ b/bundles/ie.wombat.jbdiff/src/ie/wombat/jbdiff/readme-more.txt
@@ -1,4 +1,4 @@
-This library version is based on JBDiff (http://www.wombat.ie/software/jbdiff/downloads/)
+This library version is based on JBDiff (http://www.wombat.ie/software/jbdiff/downloads/jbdiff-0.1.1.tar.gz)
which is also available under the OSI Approved :: BSD License (original)
http://www.opensource.org/licenses/bsd-license.html

Back to the top