CVS asm/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/asm/debian
In directory haydn:/tmp/cvs-serv30267/debian

Modified Files:
	ant.properties control libasm-java-doc.doc-base rules 
Log Message:
Committing changes to make avaialable for Wolfgang Baer

--- /cvsroot/pkg-java/asm/debian/ant.properties	2005/08/22 02:05:24	1.2
+++ /cvsroot/pkg-java/asm/debian/ant.properties	2005/09/12 18:17:00	1.3
@@ -1,15 +1,21 @@
 # Properties that are set within asm's default build.properties
-product.name    asm
-product.version 1.5.3
+product.name=asm
+product.version=1.5.3
 
 # Use jikes to compile
-build.compiler jikes
+build.compiler=jikes
 
 # Build class path (classes needed to build the project)
 # Class path for the ObjectWeb utility Ant tasks (version 1.2 or higher)
 # See http://forge.objectweb.org/projects/monolog
-objectweb.ant.tasks.path ow_util_ant_tasks.jar
+objectweb.ant.tasks.path=/usr/share/java/ow_util_ant_tasks.jar
 
 # URL for Javadoc generation
-jdk.url     http://java.sun.com/j2se/1.4.2/docs/api
+jdk.url=http://java.sun.com/j2se/1.4.2/docs/api
 
+# javac settings used in compilation
+javac.debug=on
+javac.deprecation=on
+javac.includes=org/**/*.java
+javac.nowarn=off
+javac.verbose=yes
--- /cvsroot/pkg-java/asm/debian/control	2005/08/22 02:05:25	1.5
+++ /cvsroot/pkg-java/asm/debian/control	2005/09/12 18:17:00	1.6
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Crafter <crafterm at debian.org>, Barry Hawkins <barry at bytemason.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), ant, kaffe, sharutils
+Build-Depends-Indep: debhelper (>= 4.0.0), ant (>= 1.6.5-1), kaffe | java-compiler, sharutils, libow-util-ant-tasks-java (>= 1.3-1)
 Standards-Version: 3.6.2.1
 
 Package: libasm-java
--- /cvsroot/pkg-java/asm/debian/libasm-java-doc.doc-base	2005/08/22 02:05:25	1.3
+++ /cvsroot/pkg-java/asm/debian/libasm-java-doc.doc-base	2005/09/12 18:17:00	1.4
@@ -1,10 +1,11 @@
 Document: libasm-java-doc
 Title: API Javadoc for ASM Bytecode Manipulation framework
-Author: Objectweb ASM Project Team
+Author: ObjectWeb ASM Project Team
 Abstract: This is the API Javadoc provided by the Objectweb
+ ASM bytecode manipulation framework
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libasm-java-doc/javadoc/index.html
-Files: /usr/share/doc/libasm-java-doc/*.html
+Index: /usr/share/doc/libasm-java-doc/api/index.html
+Files: /usr/share/doc/libasm-java-doc/api/*.html
 
--- /cvsroot/pkg-java/asm/debian/rules	2005/08/22 02:05:25	1.4
+++ /cvsroot/pkg-java/asm/debian/rules	2005/09/12 18:17:00	1.5
@@ -9,6 +9,9 @@
 # Set a locale; currently using default
 export LANG=C
 
+# Include to enable dpatch
+include /usr/share/dpatch/dpatch.make
+
 # Set JAVA_HOME to be used for Java commands
 JAVA_HOME=/usr/lib/kaffe
 
@@ -17,7 +20,7 @@
 
 JAVA_LIB=/usr/share/java
 ANT_HOME=/usr/share/ant
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar
+ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar$(JAVA_LIB)/ow_util_ant_tasks.jar
 
 # Set path to Ant properties file
 ANT_PROPS=debian/ant.properties
@@ -28,32 +31,21 @@
 ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
         org.apache.tools.ant.Main -verbose -propertyfile $(ANT_PROPS)
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: patch-stamp
 	dh_testdir
-
-	# Add here commands to compile the package.
-	#$(MAKE)
-	#/usr/bin/docbook-to-man debian/asm.sgml > asm.1
-
+	#uudecode debian/ow_util_ant_tasks.uue > ow_util_ant_tasks.jar
+	$(ANT) dist
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
+	#rm -f ow_util_ant_tasks.jar
 	# Add here commands to clean up after the build process.
 	$(ANT) clean
-	rm -f ow_util_ant_tasks.jar
 
 	dh_clean 
 
@@ -63,22 +55,11 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/asm.
-	#$(MAKE) install DESTDIR=$(CURDIR)/debian/libasm-java
-
-	# do this later and delete the .xml files on a clean
-	#for i in archive/*.xml.in \
-	#do \
-	#done \
-
-	uudecode debian/ow_util_ant_tasks.uue > ow_util_ant_tasks.jar	
-	$(ANT) dist
-
 	# install the libasm-java jar files
 	mv output/dist/lib/*.jar $(CURDIR)/debian/libasm-java/usr/share/java
 	# install the javadocs and examples
-	mkdir $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/javadoc
-	mv output/dist/doc/javadoc/user/* $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/javadoc
+	mkdir $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/api
+	mv output/dist/doc/javadoc/user/* $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/api
 	mv output/dist/examples $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc
 
 # Build architecture-independent files here.