CVS libqdox-java/debian

[Trygve Laugst??l]

Update of /cvsroot/pkg-java/libqdox-java/debian
In directory haydn:/tmp/cvs-serv10078/debian

Modified Files:
	control rules 
Log Message:
o Cleaning up rules and setting the correct build depends.

--- /cvsroot/pkg-java/libqdox-java/debian/control	2005/08/14 20:20:34	1.1.1.1
+++ /cvsroot/pkg-java/libqdox-java/debian/control	2005/08/15 03:11:16	1.2
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes-classpath, fastjar, cdbs
+Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.5), ant (>= 1.6.5), junit (>= 3.8.1), libjmock-java (>= 1.0.1)
 Standards-Version: 3.6.2
 
 Package: libqdox-java
--- /cvsroot/pkg-java/libqdox-java/debian/rules	2005/08/14 20:20:34	1.1.1.1
+++ /cvsroot/pkg-java/libqdox-java/debian/rules	2005/08/15 03:11:16	1.2
@@ -4,20 +4,13 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS      := \
-               /usr/lib/j2sdk1.4-sun \
-               /usr/lib/j2sdk1.4 \
-               /usr/lib/j2sdk1.3 \
-               /usr/lib/j2se/1.4 \
-               /usr/lib/j2se/1.3
+JAVA_HOME_DIRS  := /usr/lib/kaffe
 
 ANT_HOME        := /usr/share/ant
 DEB_JARS        := /usr/share/ant/lib/ant-launcher.jar\
-				   /usr/share/ant1.6/lib/ant-nodeps.jar \
-				   /usr/share/ant1.6/lib/ant-junit.jar\
-				   JFlex.jar \
+				   /usr/share/ant/lib/ant-nodeps.jar \
+				   /usr/share/ant/lib/ant-junit.jar\
 				   junit.jar
-#				   jmock.jar\
 
 DEB_ANT_ARGS    := -Dnoget -v
 
@@ -28,7 +21,7 @@
 PATCH_EXCLUDES=-x target -x src -x tmp -x debian -x core -x lib -x extensions -x examples -x .cvsignore
 
 make-patches:
-	diff -r -uN $(PATCH_EXCLUDES) -x Parser.java ../qdox-1.5 . > debian/patches/01_build_files || true
+	diff -r -uN $(PATCH_EXCLUDES) -x Parser.java -x JFlexLexer.java ../qdox-1.5 . > debian/patches/01_build_files || true
 	diff -r -uN $(PATCH_EXCLUDES) /dev/null Parser.java > debian/patches/02_parser_files || true
 	diff -r -uN $(PATCH_EXCLUDES) /dev/null JFlexLexer.java >> debian/patches/02_parser_files || true