[med-svn] r12649 - trunk/packages/libmtj-java/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-12-17 13:30:41 +0000 (Mon, 17 Dec 2012)
New Revision: 12649

Modified:
   trunk/packages/libmtj-java/trunk/debian/changelog
   trunk/packages/libmtj-java/trunk/debian/control
   trunk/packages/libmtj-java/trunk/debian/rules
Log:
use default java implementation


Modified: trunk/packages/libmtj-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/changelog	2012-12-17 13:17:12 UTC (rev 12648)
+++ trunk/packages/libmtj-java/trunk/debian/changelog	2012-12-17 13:30:41 UTC (rev 12649)
@@ -3,8 +3,11 @@
   * 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
 

Modified: trunk/packages/libmtj-java/trunk/debian/control
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/control	2012-12-17 13:17:12 UTC (rev 12648)
+++ trunk/packages/libmtj-java/trunk/debian/control	2012-12-17 13:30:41 UTC (rev 12649)
@@ -4,7 +4,7 @@
 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/

Modified: trunk/packages/libmtj-java/trunk/debian/rules
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/rules	2012-12-17 13:17:12 UTC (rev 12648)
+++ trunk/packages/libmtj-java/trunk/debian/rules	2012-12-17 13:30:41 UTC (rev 12649)
@@ -5,5 +5,8 @@
 %:
 	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