[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2.1+dfsg-3-12-ge2e666e

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 6e076c35576138a4f180e457ff2646b5b435c9e1
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Sep 25 14:17:23 2011 +0900

    More generic way to use JAVA_HOME

diff --git a/debian/control b/debian/control
index 9005441..ce3c9cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Peter Collingbourne <peter at pcc.me.uk>, Daigo Moriwaki <daigo at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: ant, openjdk-6-jdk, libasm3-java, maven-repo-helper
+Build-Depends-Indep: ant, openjdk-6-jdk, libasm3-java, maven-repo-helper, javahelper
 Standards-Version: 3.9.2
 Homepage: http://clojure.org
 Vcs-Git: git://git.debian.org/pkg-java/clojure.git
diff --git a/debian/rules b/debian/rules
index 7e21666..b392755 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,11 @@ PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\+dfsg//)
 UPSTREAM_VERSION = $(shell echo $(PRISTINE_VERSION) | sed s/^0\.0\.//)
 SRCDIR_NAME = $(SOURCE)-$(ORIG_VERSION).orig
 
+include /usr/share/javahelper/java-vars.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 DEB_JARS  := asm3 asm3-commons
 
 DEB_INSTALL_CHANGELOGS_ALL := changes.txt

-- 
UNNAMED PROJECT