[libmtj-java] 15/23: use default java implementation

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libmtj-java.

commit 73d29c2fc8b78324c5aa1f800bfe11484b87f8f9
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 17 13:30:41 2012 +0000

    use default java implementation
---
 debian/changelog | 5 ++++-
 debian/control   | 2 +-
 debian/rules     | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3bcb53..43628b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ mtj (0.9.14+dfsg-1) UNRELEASED; urgency=low
   * debian/copyright:
      - DEP5
      - Add Files-Excluded to document what was removed from original source
+  * debian/{control,rules}: use default java implementation
+    (thanks for the patch to James Page <james.page at ubuntu.com>)
+    Closes: #684160
 
- -- Andreas Tille <tille at debian.org>  Sat, 25 Aug 2012 00:06:50 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 17 Dec 2012 14:28:38 +0100
 
 mtj (0.9.14~dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d96ec7c..8d1574e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), javahelper (>=0.25), openjdk-6-jdk, ant,
+Build-Depends: debhelper (>= 9), javahelper (>=0.25), default-jdk (>= 1:1.6), ant,
  libnetlib-java
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/matrix-toolkits-java/
diff --git a/debian/rules b/debian/rules
index 457aec1..d52d2e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,8 @@ JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh $@ --with javahelper
 
+override_dh_auto_build:
+	dh_auto_build -- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+
 get-orig-source:
 	uscan --verbose --force-download

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