[libjettison-java] 11/34: Update copyright file because the json code uses the Apache license now. It is based on an older public domain implementation of the JSON.org library. (Closes: #585469)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjettison-java.

commit fd1dcf7b54b869985b764e252f01a47cd7a16574
Author: Torsten Werner <twerner at debian.org>
Date:   Thu Jun 10 18:21:01 2010 +0000

    Update copyright file because the json code uses the Apache license now. It
    is based on an older public domain implementation of the JSON.org library.
    (Closes: #585469)
---
 debian/changelog |  8 ++++++++
 debian/copyright | 28 +---------------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20c6fa9..b52b78a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libjettison-java (1.2-2) unstable; urgency=low
+
+  * Update copyright file because the json code uses the Apache license now. It
+    is based on an older public domain implementation of the JSON.org library.
+    (Closes: #585469)
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 10 Jun 2010 20:17:19 +0200
+
 libjettison-java (1.2-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index e5ffd89..cb2cadd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Sat, 24 Nov 2007 00:01:40 +0100.
 It was downloaded from http://jettison.codehaus.org/
 
 Copyright: (C) 2006 Envoi Solutions LLC
+           (C) 2002 JSON.org
 
 License:
 
@@ -22,30 +23,3 @@ License:
 The full text of the license can be found in
 `/usr/share/common-licenses/Apache-2.0'.
 
-----------
-
-Files in org/codehaus/jettison/json:
-
-Copyright: (c) 2006 JSON.org
-
-License:
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    The Software shall be used for Good, not Evil.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjettison-java.git