[SCM] UNNAMED PROJECT branch, unversioned-1.1, updated. debian/1.1.0+dfsg-2-1-g9a57e26

[Scott Howard]

The following commit has been merged in the unversioned-1.1 branch:
commit 9a57e26fe6f9fcf4c7860a6c571a479307eda930
Author: Scott Howard <showard at debian.org>
Date:   Mon Dec 19 00:41:32 2011 -0500

    * Build-depend on default-jdk so we can set JAVA_HOME
      (Closes: #642763)

diff --git a/debian/changelog b/debian/changelog
index 2a66b94..acee1e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clojure (1.1.0+dfsg-3) unstable; urgency=low
+
+  * QA Upload.
+  * Build-depend on default-jdk so we can set JAVA_HOME
+    (Closes: #642763)
+
+ -- Scott Howard <showard at debian.org>  Mon, 19 Dec 2011 00:40:47 -0500
+
 clojure (1.1.0+dfsg-2) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/control b/debian/control
index ceec408..3af7ac2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
 Build-Depends: debhelper (>= 5), cdbs, patchutils
-Build-Depends-Indep: ant, openjdk-6-jdk, libasm3-java, maven-repo-helper
+Build-Depends-Indep: ant, default-jdk, libasm3-java, maven-repo-helper
 Standards-Version: 3.8.4
 Homepage: http://clojure.org
 Vcs-Git: git://git.debian.org/pkg-java/clojure.git
@@ -12,7 +12,7 @@ DM-Upload-Allowed: yes
 
 Package: clojure
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm3-java
+Depends: ${misc:Depends}, default-jre | java2-runtime, libasm3-java
 Description: a Lisp dialect for the JVM
  Clojure is a dynamic programming language that targets the Java Virtual
  Machine. It is designed to be a general-purpose language, combining the
diff --git a/debian/rules b/debian/rules
index 89ac79e..ead82b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,13 @@ ORIG_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
 PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\+dfsg//)
 UPSTREAM_VERSION = $(shell echo $(PRISTINE_VERSION) | sed s/^0\.0\.//)
 SRCDIR_NAME = clojure-$(ORIG_VERSION).orig
+JAVA_HOME=/usr/bin
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS  := asm3 asm3-commons
 
 DEB_INSTALL_CHANGELOGS_ALL := changes.txt

-- 
UNNAMED PROJECT