[statcvs] 05/43: RELEASE_20030713-4

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository statcvs.

commit ec8cda3202b671f64bb1c8a853c85c4a3f58bb3a
Author: Christian Bayle <bayle at debian.org>
Date:   Thu Apr 28 21:11:09 2005 +0000

    RELEASE_20030713-4
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 12 +++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b64a745..745ac74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+statcvs (20030713-4) unstable; urgency=high
+
+  * Fixed FTBFS: Missing Build-Depends on 'junit, libjdom-java' 
+  (Closes: #306617)
+
+ -- Christian Bayle <bayle at debian.org>  Thu, 28 Apr 2005 22:20:22 +0200
+
 statcvs (20030713-3) unstable; urgency=low
 
   * Applied patch proposed by Gary Hennigan
diff --git a/debian/control b/debian/control
index e747036..1a8bd70 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: statcvs
 Section: contrib/devel
 Priority: optional
 Maintainer: Christian Bayle <bayle at 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
diff --git a/debian/rules b/debian/rules
index 5905ead..803a8f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git