[SCM] cpptasks packaging branch, master, updated. 45c1ffbf40e11410421422c0e8734bc92c6b80e7

[Torsten Werner]

The following commit has been merged in the master branch:
commit 7acf8c0f2a956a6c73b7a457fd53513e40bddaa7
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Oct 4 21:30:49 2011 +0200

    Really use default-jdk for building the package. (Closes: #643510)

diff --git a/debian/changelog b/debian/changelog
index caa48f7..b591c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cpptasks (1.0~b5-2) unstable; urgency=low
 
   * Team upload.
   * Import package into git.debian.org and add Vcs-* headers.
+  * Really use default-jdk for building the package. (Closes: #643510)
 
  -- Torsten Werner <twerner at debian.org>  Tue, 04 Oct 2011 21:26:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 9432c16..894bb2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE := ant-contrib-cpptasks
 VERSION := 1.0~b5
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 ANT_ARGS += -Djar.name=$(PACKAGE)-$(VERSION).jar
 DEB_JARS := \

-- 
cpptasks packaging