r45287 - in /packages/jhdf/trunk/debian: changelog control patches/source1.5.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Aug  2 09:43:03 2012
New Revision: 45287

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45287
Log:
* Drop build dependencies on openjdk-{6|7}-jdk,
  version default-jdk (>= 1:1.6).
  (Closes: #683552)
* d/patches/source1.5.diff: Also set -target 1.5 to ensure backwards
  compatible bytecode is created.

Added:
    packages/jhdf/trunk/debian/patches/source1.5.diff
Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/control

Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=45287&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog (original)
+++ packages/jhdf/trunk/debian/changelog Thu Aug  2 09:43:03 2012
@@ -1,8 +1,19 @@
+jhdf (2.8.0-6~exp1) experimental; urgency=low
+
+  [ James Page ]
+  * Drop build dependencies on openjdk-{6|7}-jdk,
+    version default-jdk (>= 1:1.6).
+    (Closes: #683552)
+  * d/patches/source1.5.diff: Also set -target 1.5 to ensure backwards
+    compatible bytecode is created.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 02 Aug 2012 10:00:13 +0200
+
 jhdf (2.8.0-5) unstable; urgency=low
 
   * Building with gcj fails. Build only with the openjdk-6
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 11 Mar 2012 16:07:17 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 02 Aug 2012 09:59:47 +0200
 
 jhdf (2.8.0-4) unstable; urgency=low
 

Modified: packages/jhdf/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/control?rev=45287&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/control (original)
+++ packages/jhdf/trunk/debian/control Thu Aug  2 09:43:03 2012
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, default-jdk,
- openjdk-6-jdk | openjdk-7-jdk,
- libjpeg-dev, zlib1g-dev, libhdf4-dev, libhdf5-dev (>= 1.8.8), 
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, default-jdk (>= 1:1.6),
+ libjpeg-dev, zlib1g-dev, libhdf4-dev, libhdf5-dev (>= 1.8.8),
  automake, autoconf, imagemagick
 Standards-Version: 3.9.3
 Homepage: http://www.hdfgroup.org/hdf-java-html/
@@ -21,12 +20,12 @@
  and a wide variety of metadata. It is a completely portable file format
  with no limit on the number or size of data objects in the collection.
  .
- This Java package implements HDF5 data objects in an 
+ This Java package implements HDF5 data objects in an
  object-oriented form. It provides a common Java API for accessing HDF5 files.
 
 Package: libjhdf5-jni
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends} 
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Java HDF5 Object Package (Java JNI library)
  HDF is a versatile data model that can represent very complex data objects
  and a wide variety of metadata. It is a completely portable file format

Added: packages/jhdf/trunk/debian/patches/source1.5.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/source1.5.diff?rev=45287&op=file
==============================================================================
--- packages/jhdf/trunk/debian/patches/source1.5.diff (added)
+++ packages/jhdf/trunk/debian/patches/source1.5.diff Thu Aug  2 09:43:03 2012
@@ -1,0 +1,13 @@
+Index: jhdf-2.8.0/Config/Rules.mk
+===================================================================
+--- jhdf-2.8.0.orig/Config/Rules.mk	2011-09-29 22:08:18.000000000 +0200
++++ jhdf-2.8.0/Config/Rules.mk	2012-02-28 21:27:52.181413614 +0100
+@@ -25,7 +25,7 @@
+ JAR_DIR=$(CLASS_DIR)
+ OUT_DIR=$(CLASS_DIR)/$(DIR)
+ 
+-JFLAGS= -g -deprecation -d $(CLASS_DIR)	-classpath $(CP)
++JFLAGS= -source 1.5 -target 1.5 -g -deprecation -d $(CLASS_DIR)	-classpath $(CP)
+ RMICFLAGS= -g -d $(CLASS_DIR)
+ JARFLAGS = cfm
+