tags 304187 +patch
thanks
With the attached patch 'avalon-excalibur' can be compile on unstable.
The patch does the following:
* add missing Build-Depends on 'libjdom-java, junit, liblogkit-java'
* change Build-Depends from 'j2sdk1.3' to 'j2sdk1.4'
* change Build-Depends from 'liblog4j' to 'liblog4j1.2-java'
* drop version requirements from Build-Depends on 'debhelper' and 'ant'
* change JAVA_HOME to the standard directories used by java-package
* change error in source code 's/resulSetType/resultSetType/'
Regards
Andreas Jochens
diff -urN ../tmp-orig/avalon-excalibur-4.1/debian/control ./debian/control
--- ../tmp-orig/avalon-excalibur-4.1/debian/control 2005-09-08
09:17:26.000000000 +0000
+++ ./debian/control 2005-09-05 07:44:09.000000000 +0000
@@ -2,7 +2,7 @@
Section: contrib/libs
Priority: optional
Maintainer: Takashi Okamoto <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0), ant (>>1.3), j2sdk1.3,
libavalon-framework-java, libjunitperf-java, libservlet2.3-java, liblog4j
+Build-Depends-Indep: debhelper, ant, j2sdk1.4, libavalon-framework-java,
libjunitperf-java, libservlet2.3-java, liblog4j1.2-java, libjdom-java, junit,
liblogkit-java
Standards-Version: 3.5.2
Package: libavalon-excalibur-java
diff -urN ../tmp-orig/avalon-excalibur-4.1/debian/rules ./debian/rules
--- ../tmp-orig/avalon-excalibur-4.1/debian/rules 2005-09-08
09:17:26.000000000 +0000
+++ ./debian/rules 2005-09-08 09:17:10.000000000 +0000
@@ -12,10 +12,10 @@
# This is the debhelper compatability version to use.
export DH_COMPAT=3
-jdk_dirs:=/usr/lib/j2se/1.3 /usr/lib/j2sdk1.3
+jdk_dirs:=/usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun
/usr/lib/j2sdk1.4-blackdown /usr/lib/j2sdk1.4-ibm
export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then
echo $$jdir; exit 0; fi; done)
-export
CLASSPATH=/usr/share/java/avalon-framework.jar:/usr/share/java/logkit.jar:/usr/share/java/junit.jar:/usr/share/java/junitperf.jar:/usr/share/java/xerces.jar:/usr/share/java/log4j.jar:/usr/share/servlet-2.3.jar:.
+export
CLASSPATH=/usr/share/java/jdom.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/logkit.jar:/usr/share/java/junit.jar:/usr/share/java/junitperf.jar:/usr/share/java/xerces.jar:/usr/share/java/log4j.jar:/usr/share/servlet-2.3.jar:.
#export
CLASSPATH=/usr/share/java/avalon-framework.jar:/usr/share/java/logkit.jar:/usr/share/java/junit.jar:/usr/share/java/junitperf.jar:/usr/share/java/xerces.jar:/usr/share/java/bcel.jar:.
diff -urN
../tmp-orig/avalon-excalibur-4.1/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
./src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
---
../tmp-orig/avalon-excalibur-4.1/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
2002-01-30 18:51:27.000000000 +0000
+++ ./src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
2005-09-05 06:49:15.000000000 +0000
@@ -234,7 +234,7 @@
m_connection.releaseSavepoint(savepoint);
}
- public final Statement createStatement(int resulSetType,
+ public final Statement createStatement(int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
throws SQLException
@@ -248,7 +248,7 @@
}
public final PreparedStatement prepareStatement(String sql,
- int resulSetType,
+ int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
throws SQLException
@@ -262,7 +262,7 @@
}
public final CallableStatement prepareCall(String sql,
- int resulSetType,
+ int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
throws SQLException
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
