This is an automated email from the git hooks/post-receive script. stuart pushed a commit to branch master in repository latexdraw.
commit e4e64109c84e079be76d4ea7df45cef73da42e2b Author: Stuart Prescott <[email protected]> Date: Tue Jul 22 00:25:31 2008 +0000 * remove useless targets * remove build-setup for sun-java5 --- debian/rules | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/debian/rules b/debian/rules index 8bf153e..416f96b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,28 +3,20 @@ # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -# Work out a sensible value for JAVA_HOME so that ant is happy +# If the user has not explicitly set JAVA_HOME, export sensible value +# to make sure that the correct compiler is used by ant. +# Prefer openjdk-6 JAVA_HOME ?= $(shell echo \ ` \ - ( t=/usr/lib/jvm/java-6-openjdk && test -d $$t && echo $$t ) \ - || ( t=/usr/lib/jvm/java-6-sun && test -d $$t && echo $$t ) \ - || ( t=/usr/lib/jvm/java-1.5.0-sun && test -d $$t && echo $$t )` \ + ( t=/usr/lib/jvm/java-6-openjdk && test -d $$t && test -f $$t/bin/javac && echo $$t ) \ + || ( t=/usr/lib/jvm/java-6-sun && test -d $$t && test -f $$t/bin/javac && echo $$t ) \ + ` \ ) - -# Must export a JAVA_HOME to make sure that the correct compiler -# is used by ant. export JAVA_HOME - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - - build: build-stamp -build-stamp: configure-stamp +build-stamp: dh_testdir # pass the -client option to the jvm to prevent a FTBFS with openjdk ANT_OPTS="-client" ant -Dlib.dir=/usr/share/java jar @@ -35,7 +27,7 @@ build-stamp: configure-stamp clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp find . -name \*.jar -exec rm -f {} \; find . -name \*.class -exec rm -f {} \; rm -rf out/* out/.cache api/ @@ -47,7 +39,6 @@ clean: # libjiu-java-doc, libjlibeps-java-doc # must be installed too. apidocs: build - ant -Dlib.dir=/usr/share/java doc install: build @@ -56,7 +47,7 @@ install: build dh_clean -k # Build architecture-dependent files here. -binary-arch: build install +binary-arch: # Build architecture-independent files here. binary-indep: build install @@ -80,4 +71,4 @@ binary-indep: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/latexdraw.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
