[pkg-java] r2689 - branches/dom4j/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-10-31 12:04:40 +0100 (Tue, 31 Oct 2006)
New Revision: 2689

Modified:
   branches/dom4j/feature/debian/debian/copyright
Log:
Updated copyright info.

Modified: branches/dom4j/feature/debian/debian/copyright
===================================================================
--- branches/dom4j/feature/debian/debian/copyright	2006-10-31 10:37:33 UTC (rev 2688)
+++ branches/dom4j/feature/debian/debian/copyright	2006-10-31 11:04:40 UTC (rev 2689)
@@ -53,58 +53,39 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The debian package also contains two classes from the jaxen project to
-workaround circular dependencies. These classes are licensed as follows:
+The contributions to the Debian packaging by Marcus Better are
+Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
+under the same license as dom4j, see above.
 
-The source was downloaded from <http://jaxen.org/>
+The files `DocumentNavigator.java' and `Dom4jXPath.java' from the
+jaxme package are Copyright (C) 2000-2005 Bob McWhirter and James
+Strachan, and are licensed as follows:
 
-Upstream Authors: Bob McWhirter <bob at werken.com> and 
-                  James Strachan <jstrachan at apache.org>
+     Copyright 2003 (C) The Werken Company. All Rights Reserved.
 
-Copyright:
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are
+     met:
 
-/*
- $Id: LICENSE.txt,v 1.3 2003/06/29 18:22:02 ssanders Exp $
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
 
- Copyright 2003 (C) The Werken Company. All Rights Reserved.
- 
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
+      * 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.
 
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
- 
- 2. 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.
- 
- 3. The name "jaxen" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Werken Company.  For written permission,
-    please contact bob at werken.com.
- 
- 4. Products derived from this Software may not be called "jaxen"
-    nor may "jaxen" appear in their names without prior written
-    permission of The Werken Company. "jaxen" is a registered
-    trademark of The Werken Company.
- 
- 5. Due credit should be given to The Werken Company.
-    (http://jaxen.werken.com/).
- 
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED 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 WERKEN COMPANY OR ITS 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.
+      * Neither the name of the Jaxen Project 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.