[pkg-java] r3608 - in branches/libjaxen-java/feature/debian: . debian src/java/test/org/jaxen/test
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Wed Jun 6 15:37:40 UTC 2007
Author: marcusb-guest
Date: 2007-06-06 15:37:40 +0000 (Wed, 06 Jun 2007)
New Revision: 3608
Removed:
branches/libjaxen-java/feature/debian/debian/patches/
Modified:
branches/libjaxen-java/feature/debian/build.xml
branches/libjaxen-java/feature/debian/debian/README.Debian
branches/libjaxen-java/feature/debian/debian/changelog
branches/libjaxen-java/feature/debian/debian/control
branches/libjaxen-java/feature/debian/debian/rules
branches/libjaxen-java/feature/debian/src/java/test/org/jaxen/test/JaxenTests.java
Log:
Re-enable dom4j support. We no longer split out dom4j support to the dom4j package. This introduces a circular build- and runtime dependency on dom4j, which is ok.
Modified: branches/libjaxen-java/feature/debian/build.xml
===================================================================
--- branches/libjaxen-java/feature/debian/build.xml 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/build.xml 2007-06-06 15:37:40 UTC (rev 3608)
@@ -44,7 +44,6 @@
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <exclude name="org/jaxen/dom4j/*"/>
<exclude name="org/jaxen/xom/*"/>
<src>
<pathelement location="src/java/main">
@@ -100,7 +99,6 @@
<batchtest todir="${testreportdir}">
<fileset dir="src/java/test">
<include name="**/*Test.java"/>
- <exclude name="org/jaxen/test/DOM4J*.java"/>
<exclude name="org/jaxen/test/XOM*.java"/>
</fileset>
</batchtest>
@@ -115,7 +113,6 @@
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <exclude name="org/jaxen/test/DOM4J*.java"/>
<exclude name="org/jaxen/test/XOM*.java"/>
<src>
<pathelement location="src/java/test">
Modified: branches/libjaxen-java/feature/debian/debian/README.Debian
===================================================================
--- branches/libjaxen-java/feature/debian/debian/README.Debian 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/debian/README.Debian 2007-06-06 15:37:40 UTC (rev 3608)
@@ -1,14 +1,8 @@
libjaxen-java for Debian
------------------------
-Jaxen in Debian supports JDOM, DOM out of the box.
+Jaxen in Debian supports JDOM, DOM and dom4j out of the box. Support
+for XOM is disabled for the time being, since XOM has not yet been
+packaged for Debian.
-Due to circular dependencies which need to be solved upstream we split
-the XOM and DOM4J XPath support parts out to their respective packages
-in debian (currently there is only a dom4j package).
-
-As one needs the dom4j jar is one wants to use jaxen with dom4j there is
-no difference from a user point of view if some classes are in the dom4j jar
-instead of the jaxen jar.
-
- -- Arnaud Vandyck <avdyk at debian.org>, Fri Apr 15 16:31:06 2005
+ -- Marcus Better <marcus at better.se>, Wed, 6 Jun 2007 17:35:58 +0200
Modified: branches/libjaxen-java/feature/debian/debian/changelog
===================================================================
--- branches/libjaxen-java/feature/debian/debian/changelog 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/debian/changelog 2007-06-06 15:37:40 UTC (rev 3608)
@@ -1,6 +1,7 @@
libjaxen-java (1.1.1-1) unstable; urgency=low
* New upstream release. (Closes: #427224)
+ * Build-depend on libdom4j-java and re-enable DOM4J unit tests.
* debian/control: Add XS-Vcs-* fields.
-- Marcus Better <marcus at better.se> Wed, 06 Jun 2007 17:21:05 +0200
Modified: branches/libjaxen-java/feature/debian/debian/control
===================================================================
--- branches/libjaxen-java/feature/debian/debian/control 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/debian/control 2007-06-06 15:37:40 UTC (rev 3608)
@@ -2,16 +2,16 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
-Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>
+Build-Depends: debhelper (>= 5), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java, libdom4j-java
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjaxen-java
XS-Vcs-Browse: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java/
Package: libjaxen-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java, libxerces2-java
+Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java, libxerces2-java, libdom4j-java
Suggests: java-virtual-machine
Conflicts: libsaxpath-java
Replaces: libsaxpath-java
Modified: branches/libjaxen-java/feature/debian/debian/rules
===================================================================
--- branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:37:40 UTC (rev 3608)
@@ -4,7 +4,7 @@
DEB_JARS_BASE := /usr/share/java
JAVACMD := $(JAVA_HOME)/bin/java
-DEB_JARS := ant ant-launcher jdom1 ant-junit junit xercesImpl
+DEB_JARS := ant ant-launcher jdom1 dom4j ant-junit junit xercesImpl
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
Modified: branches/libjaxen-java/feature/debian/src/java/test/org/jaxen/test/JaxenTests.java
===================================================================
--- branches/libjaxen-java/feature/debian/src/java/test/org/jaxen/test/JaxenTests.java 2007-06-06 15:26:00 UTC (rev 3607)
+++ branches/libjaxen-java/feature/debian/src/java/test/org/jaxen/test/JaxenTests.java 2007-06-06 15:37:40 UTC (rev 3608)
@@ -72,6 +72,7 @@
result.addTest(CoreTests.suite());
result.addTest(DOMTests.suite());
result.addTest(JDOMTests.suite());
+ result.addTest(DOM4JTests.suite());
result.addTest(JavaBeanTests.suite());
result.addTest(PatternTests.suite());
result.addTest(BaseTests.suite());
More information about the pkg-java-commits
mailing list