The attached patch makes xml-soap build on current unstable.
The patch does the following:
* replace Build-Depends on libservlet2.2-java by libservlet2.3-java
* add Build-Depends on libgnumail-java
* use j2sdk1.4 instead of j2sdk1.3
* use standard JAVA_HOME directory names from java-package
* adjust CLASSPATH to use gnumail.jar instead of things from /usr/local
* use 'ant' in debian/rules
Regards
Andreas Jochens
diff -urN ../tmp-orig/xml-soap-2.3.1/debian/control ./debian/control
--- ../tmp-orig/xml-soap-2.3.1/debian/control 2005-09-12 11:56:44.000000000
+0000
+++ ./debian/control 2005-09-12 11:56:42.000000000 +0000
@@ -2,7 +2,7 @@
Section: contrib/libs
Priority: optional
Maintainer: Takashi Okamoto <[EMAIL PROTECTED]>
-Build-Depends-Indep:
debhelper(>>3.0.0),ant,junit,libxerces-java,libbsf-java,libservlet2.2-java,j2sdk1.3
| j2sdk1.2
+Build-Depends-Indep: debhelper, ant, junit, libgnumail-java, libxerces-java,
libbsf-java, libservlet2.3-java, j2sdk1.4
Standards-Version: 3.5.2
Package: libsoap-java
diff -urN ../tmp-orig/xml-soap-2.3.1/debian/rules ./debian/rules
--- ../tmp-orig/xml-soap-2.3.1/debian/rules 2005-09-12 11:56:44.000000000
+0000
+++ ./debian/rules 2005-09-12 11:55:52.000000000 +0000
@@ -11,14 +11,9 @@
version=2.2
-# Uncomment the next line to build a Java 2 version
-export JAVA_HOME=/usr/local/j2sdk1.4.0_01
-export JAVA=${JAVA_HOME}/bin/java
-export JAR=${JAVA_HOME}/bin/jar
-# write about optional jar here.
-export
CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:/usr/share/java/ant.jar:/usr/share/java/xerces.jar:/usr/share/java/servlet-2.2.jar:/usr/share/java/bsf.jar:/usr/share/java/junit.jar:/usr/local/share/java/activation.jar:/usr/local/share/java/mail.jar:/usr/local/share/java/mailapi.jar:/usr/local/share/java/pop3.jar:/usr/local/share/java/smtp.jar:/usr/local/share/java/ejb.jar:/usr/local/share/java/jsse.jar:/usr/local/share/java/jnet.jar:/usr/local/share/java/jsse.jar:${JAVA_HOME}/lib/tools.jar:.
-
-
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun
/usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do if [ -d "$$j" ];
then echo $$j; exit 0; fi; done)
+export
CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:/usr/share/java/gnumail.jar:/usr/share/java/ant.jar:/usr/share/java/xerces.jar:/usr/share/java/servlet-2.3.jar:/usr/share/java/bsf.jar:/usr/share/java/junit.jar:/usr/share/java/activation.jar:/usr/share/java/mail.jar:${JAVA_HOME}/lib/tools.jar:.
build: build-stamp
@@ -26,7 +21,7 @@
dh_testdir
# Add here commands to compile the package.
- ${JAVA} org.apache.tools.ant.Main compile buildwar javadocs
+ ant compile buildwar javadocs
touch build-stamp
@@ -36,8 +31,7 @@
rm -f build-stamp
rm -f TEST-test.encoding.soapenc.PackageTests.txt
# Add here commands to clean up after the build process.
- ${JAVA} org.apache.tools.ant.Main clean
-# ant clean
+ ant clean
dh_clean
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
