[med-svn] [SCM] picard-tools branch, master, updated. upstream/1.55-54-ge0e4d2d

[Charles Plessy]

The following commit has been merged in the master branch:
commit e0e4d2dcd1921ddf7095f024dfe08a50e01f897e
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Aug 8 13:19:13 2012 +0900

    Use default java implementation.
    
     - debian/control: BD on default-jdk, switch runtime dependency to
       default-jre | java6-runtime.
     - debian/rules: Specify source/target = 1.5 to ensure that backwards
       compatible bytecode is built.
     - Closes: #684172, thanks to J. Page and Ubuntu.

diff --git a/debian/changelog b/debian/changelog
index 8347949..660a08b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ picard-tools (1.55-1) UNRELEASED; urgency=low
   * New upstream releases.
   * Build-depend on libsnappy-java (debian/control).
   * Refreshed debian/patches/01-build.xml.
+  * Use default java implementation.
+    - debian/control: BD on default-jdk, switch runtime dependency to
+      default-jre | java6-runtime.
+    - debian/rules: Specify source/target = 1.5 to ensure that backwards
+      compatible bytecode is built.
+    - Closes: #684172, thanks to J. Page and Ubuntu.
 
  -- Charles Plessy <plessy at debian.org>  Fri, 04 Nov 2011 22:25:11 +0900
 
diff --git a/debian/control b/debian/control
index b373b39..739e51d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 DM-Upload-Allowed: yes
 Uploaders: Shaun Jackman <sjackman at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: ant, openjdk-6-jdk|java-compiler, testng, libsnappy-java,
+Build-Depends: ant, default-jdk, testng, libsnappy-java,
  debhelper (>= 7.0.50~)
 Standards-Version: 3.9.2
 Homepage: http://picard.sourceforge.net/
@@ -23,7 +23,7 @@ Description: Java library to manipulate SAM and BAM files
 
 Package: picard-tools
 Architecture: all
-Depends: openjdk-6-jre|java-runtime, ${misc:Depends},
+Depends: default-jre | java6-runtime, ${misc:Depends},
  libsam-java (>= ${source:Version}), ${python:Depends}
 Suggests: python, r-base-core
 Description: Command line tools to manipulate SAM and BAM files
diff --git a/debian/rules b/debian/rules
index 60a4aef..440e3d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ export DH_OPTIONS
 %:
 	dh  $@
 
+override_dh_auto_build:
+	dh_auto_build -- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+
 override_dh_auto_configure:
 	[ -d lib ] || mkdir lib # This empty directory is lost in the packages's Git clone.
 	dh_auto_configure

-- 
manipulate SAM and BAM files