[pkg-java] r12548 - trunk/libjettison-java/debian

[Torsten Werner]

Author: twerner
Date: 2010-06-10 18:21:01 +0000 (Thu, 10 Jun 2010)
New Revision: 12548

Modified:
   trunk/libjettison-java/debian/changelog
   trunk/libjettison-java/debian/copyright
Log:
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)

Modified: trunk/libjettison-java/debian/changelog
===================================================================
--- trunk/libjettison-java/debian/changelog	2010-06-10 17:39:02 UTC (rev 12547)
+++ trunk/libjettison-java/debian/changelog	2010-06-10 18:21:01 UTC (rev 12548)
@@ -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.

Modified: trunk/libjettison-java/debian/copyright
===================================================================
--- trunk/libjettison-java/debian/copyright	2010-06-10 17:39:02 UTC (rev 12547)
+++ trunk/libjettison-java/debian/copyright	2010-06-10 18:21:01 UTC (rev 12548)
@@ -4,6 +4,7 @@
 It was downloaded from http://jettison.codehaus.org/
 
 Copyright: (C) 2006 Envoi Solutions LLC
+           (C) 2002 JSON.org
 
 License:
 
@@ -22,30 +23,3 @@
 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.