Version: 1.6.1+dfsg.2-2
On Tue, Dec 16, 2008 at 04:22:14PM -0600, Chris Cheney wrote:
Package: dom4j
Version: 1.6.1+dfsg-3
Severity: important
Tags: patch
This is a patch to convert dom4j to use default-jre and also fixes the
various lintian errors that are being output.
Thanks,
Chris Cheney
diff -u dom4j-1.6.1+dfsg/debian/rules dom4j-1.6.1+dfsg/debian/rules
--- dom4j-1.6.1+dfsg/debian/rules
+++ dom4j-1.6.1+dfsg/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-JAVA_HOME:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME:= /usr/lib/jvm/default-java
DEB_JARS_BASE:= /usr/share/java
JAVACMD := $(JAVA_HOME)/bin/java
diff -u dom4j-1.6.1+dfsg/debian/control dom4j-1.6.1+dfsg/debian/control
--- dom4j-1.6.1+dfsg/debian/control
+++ dom4j-1.6.1+dfsg/debian/control
@@ -4,15 +4,15 @@
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Marcus Better mar...@better.se, Michael Koch konque...@gmx.de
Build-Depends: debhelper (= 5)
-Build-Depends-Indep: antlr, openjdk-6-jdk, ant-optional, 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.3
+Build-Depends-Indep: antlr, default-jdk, ant-optional,
libbackport-util-concurrent-java, libjaxen-java (= 1.1~beta11),
libjaxme-java, libjunitperf-java, libxalan2-java (= 2.7.0), libxerces2-java,
libxpp2-java, libxpp3-java, junit
+Standards-Version: 3.8.0.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/dom4j
Homepage: http://www.dom4j.org
Package: libdom4j-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjaxen-java (=
1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java,
libbackport-util-concurrent-java
+Depends: default-jre-headless | java2-runtime-headless,
libbackport-util-concurrent-java, libjaxen-java (= 1.1~beta11),
libjaxme-java, libxpp2-java, libxpp3-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
Building this package with default-jdk is probably not a good idea
as we had some issues in the past when building the package with GCJ.
default-jdk points on some archs to openjdk but on others to gcj.
So we need to be careful here.
I applied the Depends line of libdom4j-java and some other changes
to version 1.6.1+dfsg.2-2 of the package and so closing the bug
report.
Thanks for providing the patch.
Cheers,
Michael
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
