[pkg-java] r2704 - in trunk/dom4j/dom4j: . debian
Marcus Better
marcusb-guest at alioth.debian.org
Wed Nov 1 12:38:06 CET 2006
Author: marcusb-guest
Date: 2006-11-01 12:38:05 +0100 (Wed, 01 Nov 2006)
New Revision: 2704
Added:
trunk/dom4j/dom4j/debian/libdom4j-java-doc.links
Removed:
trunk/dom4j/dom4j/debian/jaxen_src/
trunk/dom4j/dom4j/debian/patches/
Modified:
trunk/dom4j/dom4j/build.xml
trunk/dom4j/dom4j/debian/README.Debian
trunk/dom4j/dom4j/debian/README.Debian.source
trunk/dom4j/dom4j/debian/control
trunk/dom4j/dom4j/debian/rules
Log:
Merge debian branch (r2703).
Modified: trunk/dom4j/dom4j/build.xml
===================================================================
--- trunk/dom4j/dom4j/build.xml 2006-11-01 11:35:31 UTC (rev 2703)
+++ trunk/dom4j/dom4j/build.xml 2006-11-01 11:38:05 UTC (rev 2704)
@@ -19,6 +19,7 @@
<fileset dir="/usr/share/java">
<include name="backport-util-concurrent.jar" />
<include name="jaxen.jar" />
+ <include name="junitperf.jar" />
<include name="xalan2.jar" />
<include name="xercesImpl.jar" />
<include name="xpp3.jar" />
@@ -223,8 +224,7 @@
doctitle="${Name}"
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
stylesheetfile="${doc.dir}/style/javadoc.css">
- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
+ <link href="file:///usr/share/doc/classpath-doc/api"/>
</javadoc>
<mkdir dir="${build.apidocs}"/>
@@ -240,8 +240,7 @@
doctitle="${Name}"
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
stylesheetfile="${doc.dir}/style/javadoc.css">
- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
+ <link href="file:///usr/share/doc/classpath-doc/api"/>
<link href="${build.javadocs}"/>
</javadoc>
</target>
@@ -282,10 +281,17 @@
<path refid="test.classpath" />
</classpath>
+ <sysproperty key="org.xml.sax.driver"
+ value="org.apache.xerces.parsers.SAXParser"/>
+
<batchtest fork="yes" todir="${build.dir}/test-results/xml">
<fileset dir="${test.dir}">
<include name="**/*Test.java" />
- <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java,**/StaxTest.java,**/datatype/*Test.java" />
+ <exclude name="**/AllTests.java" />
+ <exclude name="**/Abstract*.java" />
+ <exclude name="**/TestCase.java" />
+ <exclude name="**/StaxTest.java" />
+ <exclude name="**/datatype/*Test.java" />
</fileset>
</batchtest>
</junit>
Modified: trunk/dom4j/dom4j/debian/README.Debian
===================================================================
--- trunk/dom4j/dom4j/debian/README.Debian 2006-11-01 11:35:31 UTC (rev 2703)
+++ trunk/dom4j/dom4j/debian/README.Debian 2006-11-01 11:38:05 UTC (rev 2704)
@@ -1,10 +1,11 @@
dom4j for Debian
----------------
-dom4j for debian is currently built without support for xsd because of
+dom4j for debian is currently built without support for XSD and xsd because of
license issues.
-Because of circular dependencies with libjaxen-java for the XPath
-support, the dom4j jar will include the needed jaxen classes.
+Because of circular dependencies with jaxen for the XPath support, the
+dom4j jar includes the classes DocumentNavigator and Dom4jXPath from
+the package org.jaxen.dom4j.
- -- Marcus Better <marcus at better.se>, Mon, 9 Oct 2006 21:13:53 +0200
+ -- Marcus Better <marcus at better.se>, Wed, 1 Nov 2006 12:25:21 +0100
Modified: trunk/dom4j/dom4j/debian/README.Debian.source
===================================================================
--- trunk/dom4j/dom4j/debian/README.Debian.source 2006-11-01 11:35:31 UTC (rev 2703)
+++ trunk/dom4j/dom4j/debian/README.Debian.source 2006-11-01 11:38:05 UTC (rev 2704)
@@ -4,4 +4,5 @@
* Removed binary-only jars in the `lib' directory and its
subdirectories.
* Removed `src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' which
- comes from Sun Microsystems and cannot be legally distributed.
+ comes from Sun Microsystems and cannot be legally distributed. It is
+ replaced by the classes from the backport-util-concurrent package.
Modified: trunk/dom4j/dom4j/debian/control
===================================================================
--- trunk/dom4j/dom4j/debian/control 2006-11-01 11:35:31 UTC (rev 2703)
+++ trunk/dom4j/dom4j/debian/control 2006-11-01 11:38:05 UTC (rev 2704)
@@ -4,12 +4,12 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Marcus Better <marcus at better.se>
Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
-Build-Depends-Indep: antlr, java-gcj-compat-dev, libjaxp1.2-java, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
+Build-Depends-Indep: antlr, java-gcj-compat-dev, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
Standards-Version: 3.7.2
Package: libdom4j-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjaxp1.2-java | libjaxp1.3-java, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
+Depends: kaffe | java1-runtime | java2-runtime, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
Suggests: java-virtual-machine, libdom4j-java-doc
Description: flexible XML framework for Java
dom4j is a library for working with XML, XPath and XSLT on the Java
Copied: trunk/dom4j/dom4j/debian/libdom4j-java-doc.links (from rev 2703, branches/dom4j/feature/debian/debian/libdom4j-java-doc.links)
Modified: trunk/dom4j/dom4j/debian/rules
===================================================================
--- trunk/dom4j/dom4j/debian/rules 2006-11-01 11:35:31 UTC (rev 2703)
+++ trunk/dom4j/dom4j/debian/rules 2006-11-01 11:38:05 UTC (rev 2704)
@@ -4,7 +4,7 @@
DEB_JARS_BASE := /usr/share/java
JAVACMD := $(JAVA_HOME)/bin/java
-DEB_JARS := ant ant-launcher jaxp-1.2.jar xpp2 xpp3 jaxen jaxmeapi \
+DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \
xalan2 xercesImpl ant-junit junit junitperf
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
@@ -18,7 +18,7 @@
ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
org.apache.tools.ant.Main $(DEB_ANT_ARGS)
-PKGNAME := libjaxme-java
+PKGNAME := libdom4j-java
INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
JAVALIBDIR := $(INSTALLDIR)/usr/share/java
@@ -27,7 +27,7 @@
build: build-stamp
build-stamp:
dh_testdir
- $(ANT_INVOKE) package test
+ $(ANT_INVOKE) package test release-javadoc
touch build-stamp
clean:
@@ -52,6 +52,7 @@
$(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api
install -m 644 build/dom4j.jar $(JAVALIBDIR)/dom4j-$(VERSION).jar
ln -s dom4j-$(VERSION).jar $(JAVALIBDIR)/dom4j.jar
+ dh_link
dh_compress
dh_fixperms
dh_installdeb
@@ -63,6 +64,3 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
-
-# move jaxen/dom4j stuff to the source directory
-# cp -r debian/jaxen_src/* src/java/
More information about the pkg-java-commits
mailing list