[pkg-java] r8272 - in trunk/dom4j/dom4j: debian src/java/org

[Marcus Better]

Author: marcusb-guest
Date: 2009-05-18 16:00:37 +0000 (Mon, 18 May 2009)
New Revision: 8272

Modified:
   trunk/dom4j/dom4j/debian/changelog
   trunk/dom4j/dom4j/debian/copyright
   trunk/dom4j/dom4j/src/java/org/
Log:
Remove source files from jaxen since we have (circular) build
dependency on libjaxen-java. (Closes: #427913)

Modified: trunk/dom4j/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/dom4j/debian/changelog	2009-05-18 15:53:46 UTC (rev 8271)
+++ trunk/dom4j/dom4j/debian/changelog	2009-05-18 16:00:37 UTC (rev 8272)
@@ -2,8 +2,10 @@
 
   * Remove non-free generated files. (Closes: #529308)
   * Change section to java.
+  * Remove source files from jaxen since we have (circular) build
+    dependency on libjaxen-java. (Closes: #427913)
 
- -- Marcus Better <marcus at better.se>  Mon, 18 May 2009 17:53:17 +0200
+ -- Marcus Better <marcus at better.se>  Mon, 18 May 2009 17:55:40 +0200
 
 dom4j (1.6.1+dfsg-3) unstable; urgency=low
 

Modified: trunk/dom4j/dom4j/debian/copyright
===================================================================
--- trunk/dom4j/dom4j/debian/copyright	2009-05-18 15:53:46 UTC (rev 8271)
+++ trunk/dom4j/dom4j/debian/copyright	2009-05-18 16:00:37 UTC (rev 8272)
@@ -56,36 +56,3 @@
 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 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:
-
-     Copyright 2003 (C) The Werken Company. 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 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.


Property changes on: trunk/dom4j/dom4j/src/java/org
___________________________________________________________________
Deleted: svn:externals
   - jaxen/dom4j	-r2612	svn://svn.debian.org/pkg-java/trunk/libjaxen-java/libjaxen-java/src/java/main/org/jaxen/dom4j