CVS statcvs/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/statcvs/debian
In directory haydn:/tmp/cvs-serv24236/statcvs/debian

Modified Files:
	changelog control rules 
Log Message:
RELEASE_20030713-4


--- /cvsroot/pkg-java/statcvs/debian/changelog	2004/09/05 20:08:23	1.3
+++ /cvsroot/pkg-java/statcvs/debian/changelog	2005/04/28 21:11:09	1.4
@@ -1,3 +1,10 @@
+statcvs (20030713-4) unstable; urgency=high
+
+  * Fixed FTBFS: Missing Build-Depends on 'junit, libjdom-java' 
+  (Closes: #306617)
+
+ -- Christian Bayle <bayle@debian.org>  Thu, 28 Apr 2005 22:20:22 +0200
+
 statcvs (20030713-3) unstable; urgency=low
 
   * Applied patch proposed by Gary Hennigan
--- /cvsroot/pkg-java/statcvs/debian/control	2004/09/05 20:08:23	1.3
+++ /cvsroot/pkg-java/statcvs/debian/control	2005/04/28 21:11:09	1.4
@@ -2,7 +2,7 @@
 Section: contrib/devel
 Priority: optional
 Maintainer: Christian Bayle <bayle@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), sun-j2sdk1.4, ant
+Build-Depends-Indep: debhelper, sun-j2sdk1.5 | sun-j2sdk1.4, ant, junit, libjdom-java
 Standards-Version: 3.6.0
 
 Package: statcvs
--- /cvsroot/pkg-java/statcvs/debian/rules	2004/09/05 20:08:23	1.3
+++ /cvsroot/pkg-java/statcvs/debian/rules	2005/04/28 21:11:09	1.4
@@ -4,13 +4,11 @@
 #export DH_VERBOSE=1
 
 # Build 
-#export JAVA_HOME=/usr/lib/j2se/1.4
-#export JAVA=/usr/lib/j2se/1.4/bin/java
-#export JAVAC=/usr/lib/j2se/1.4/bin/javac
-export JAVA_HOME=/usr/lib/j2sdk1.4-sun
-export JAVA=/usr/lib/j2sdk1.4-sun/bin/java
-export JAVAC=/usr/lib/j2sdk1.4-sun/bin/javac
-export JAR=/usr/lib/j2sdk1.4-sun/bin/jar
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
+export JAVA=$(JAVA_HOME)/bin/java
+export JAVAC=$(JAVA_HOME)/bin/javac
+export JAR=$(JAVA_HOME)/bin/jar
 # this only compile with sun javac and jar at the moment
 
 #export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip