CVS owanttasks/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/owanttasks/debian
In directory haydn:/tmp/cvs-serv28163/debian

Modified Files:
	ant.properties changelog control libowanttasks-java.doc-base 
	rules 
Log Message:
Addition of patching and further packaging development

--- /cvsroot/pkg-java/owanttasks/debian/ant.properties	2005/08/26 03:10:51	1.1.1.1
+++ /cvsroot/pkg-java/owanttasks/debian/ant.properties	2005/08/31 03:17:23	1.2
@@ -1,4 +1,14 @@
+
+# Directory that needs to contain ant.jar
+# for the Ant tasks to compile
+prj.externals=/usr/share/ant/lib
+
 # Compiler selection
 build.compiler=jikes
 
-# 
\ No newline at end of file
+# javac settings used in compilation
+javac.debug=on
+javac.deprecation=on
+javac.includes=org/**/*.java
+javac.nowarn=off
+javac.verbose=yes
--- /cvsroot/pkg-java/owanttasks/debian/changelog	2005/08/26 03:10:51	1.1.1.1
+++ /cvsroot/pkg-java/owanttasks/debian/changelog	2005/08/31 03:17:23	1.2
@@ -1,4 +1,4 @@
-libowanttasks-java (1.3-1) unstable; urgency=low
+owanttasks (1.3-1) unstable; urgency=low
 
   * Initial release Closes: #325036
 
--- /cvsroot/pkg-java/owanttasks/debian/control	2005/08/26 03:10:51	1.1.1.1
+++ /cvsroot/pkg-java/owanttasks/debian/control	2005/08/31 03:17:23	1.2
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Barry Hawkins <barry at bytemason.org>
-Build-Depends: debhelper (>= 4.0.0), ant, kaffe, gjdoc
+Build-Depends: debhelper (>= 4.0.0), dpatch, kaffe, ant, junit, libxalan2-java
 Standards-Version: 3.6.2.1
 
 Package: libowanttasks-java
--- /cvsroot/pkg-java/owanttasks/debian/libowanttasks-java.doc-base	2005/08/26 03:10:51	1.1.1.1
+++ /cvsroot/pkg-java/owanttasks/debian/libowanttasks-java.doc-base	2005/08/31 03:17:23	1.2
@@ -6,7 +6,7 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libowanttasks-java/javadoc/index.html
-Files: /usr/share/doc/libowanttasks-java/javadoc/*.html
+Index: /usr/share/doc/libowanttasks-java/api/index.html
+Files: /usr/share/doc/libowanttasks-java/api/*.html
 
   
--- /cvsroot/pkg-java/owanttasks/debian/rules	2005/08/26 03:10:51	1.1.1.1
+++ /cvsroot/pkg-java/owanttasks/debian/rules	2005/08/31 03:17:23	1.2
@@ -3,7 +3,7 @@
 # debian/rules for owanttasks
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # Set a locale; currently using default
 export LANG=C
@@ -24,7 +24,7 @@
 # class path) to ensure the same build results in all cases
 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:$(JAVA_HOME)/lib/tools.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
 
 # Set path to Ant properties file
 ANT_PROPS=debian/ant.properties
@@ -40,13 +40,15 @@
 build-stamp: patch-stamp
 	dh_testdir
 	$(ANT) jar
+	$(ANT) javadoc
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	$(ANT) clean
+	rm -rf api
 	dh_clean
 
 install: build
@@ -57,9 +59,9 @@
 	mkdir -p $(TEMPDIR)/usr/share/java
 	mkdir -p $(TEMPDIR)/usr/share/doc/libowanttasks-java
 
-	# Add here commands to install the package into debian/libowanttasks-java.
-	install -m 644 output/lib/*.jar 
-			$(TEMPDIR)/debian/libowanttasks-java
+	install -m 644 output/lib/ow_util_ant_tasks.jar \
+			$(TEMPDIR)/usr/share/java
+	mv api $(TEMPDIR)/usr/share/doc/libowanttasks-java
 
 
 # Build architecture-independent files here.