tags 310237 patch
stop

Hi J�rg,

here are the patches

Wolfgang
--- debian/control.orig	2005-05-22 17:10:41.000000000 +0200
+++ debian/control	2005-05-22 16:33:19.000000000 +0200
@@ -1,13 +1,14 @@
 Source: asm
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Marcus Crafter <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.0), ant, sharutils, j2sdk | java2-compiler
+Build-Depends-Indep: debhelper (>= 4.0.0), libant1.6-java, kaffe, sharutils
 Standards-Version: 3.6.1.1
 
 Package: libasm-java
 Architecture: all
-Depends: j2re1.3 | java2-runtime, ${misc:Depends}
+Depends: kaffe | java1-runtime | java2-runtime, ${misc:Depends}
+Suggests: java-virtual-machine, libasm-java-doc
 Description: Java bytecode manipulation framework
  ASM is a Java bytecode manipulation framework. It can be used to
  dynamically generate stub classes or other proxy classes, directly in
--- debian/rules.orig	2005-05-22 17:10:41.000000000 +0200
+++ debian/rules	2005-05-22 16:42:03.000000000 +0200
@@ -6,6 +6,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export ANT_HOME=/usr/share/ant1.6
+export JAVA_HOME=/usr/lib/kaffe
+export CLASSPATH=${ANT_HOME}/lib/ant-launcher.jar:${ANT_HOME}/lib/ant.jar
+
+# Ant options
+ANT_OPTS=-Dbuild.compiler=jikes -Dant.home=${ANT_HOME}
+ANT=${JAVA_HOME}/bin/java org.apache.tools.ant.Main ${ANT_OPTS}
+ 
 
 configure: configure-stamp
 configure-stamp:
@@ -31,7 +39,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	ant clean
+	${ANT} clean
 	rm -f ow_util_ant_tasks.jar
 
 	dh_clean 
@@ -51,7 +59,7 @@
 	#done \
 	
 	uudecode debian/ow_util_ant_tasks.uue > ow_util_ant_tasks.jar	
-	ant dist
+	${ANT} dist 
 
 	# install the libasm-java jar files
 	mv output/dist/lib/*.jar $(CURDIR)/debian/libasm-java/usr/share/java

Reply via email to