Package: jhdf
Version: 2.8.0-5
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Drop build dependencies on openjdk-{6|7}-jdk,
version default-jdk (>= 1:1.6).
* d/patches/source1.5.diff: Also set -target 1.5 to ensure backwards
compatible bytecode is created.
This will ensure that the default java implementation is used to build this
package (which it was anyway) - this is important in Ubuntu as we are
transitioning from openjdk-6 -> openjdk-7 - by using default-jdk future
transition change will be minimised.
Second bit ensure bytecode will work with older JVM's when built with openjdk-7
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-7-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQGV7YAAoJEL/srsug59jDHbwQAM3V10j/5coa67CjmL/daXqF
6oWjuju/KNYJMROVqv0qiE3sCgLSaGe45o3GUeN8XfbGuuApVV4fIUiYnyVYMJcW
cKjIag0KwK87KknpuV5OTX18hCzjRouyq2QcMV5HFSElIt3HoNvFs1z+SvzKet/M
L02BuZAb6Ywn+mn9tRVuOecnlmJ5DK9oGag3KftoiBTPS8hSs3503rCwGFYquJCE
9QNpuS0MsdkvMAc/vzv6ivY+jN15u5xAKgNssvRKnqI8G6n5CEuOcTBBO66udrw/
Cfu0vti24dW+3YQU3i/kHxh3ZbrmslfOMu5zsuMNWpMh0Pfy2nxECFfAOh7bSp5v
/7hKmHCawq6CzJmFM3YLhONO6b//+duLWvdtJ2pcJq+J/zgwqLHzuUWs0yOerpE2
RKbKO2sfT6iTzQl2a/Lfyz1bu/YYsTQ9Pzmd9A8NM7NOzE6VoZQY1rgYAXp9PQid
Ce8mR8QhIKrdRVVpc15zpZooKMsLtWRkE8uqtSAHOvtJ61fwUddHHIXMkn/WS4sf
hMZyUJ8dSo6czGmerjwByIjHI3R9yT0XZJm5loqMZhGlCPWJ+r6UvNFhAUCviyQ/
0vUb0CeDhR4nNO3+xiEN+hzgi5MKZRf568L3geQIIvFX7CsTWq4+ZQXYomL6RS5q
C307UrOBEUkRummq4rFd
=yY0b
-----END PGP SIGNATURE-----
diff -Nru jhdf-2.8.0/debian/changelog jhdf-2.8.0/debian/changelog
diff -Nru jhdf-2.8.0/debian/control jhdf-2.8.0/debian/control
--- jhdf-2.8.0/debian/control 2012-03-11 15:25:25.000000000 +0000
+++ jhdf-2.8.0/debian/control 2012-08-01 17:49:59.000000000 +0100
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Debian Science Team <[email protected]>
Uploaders: Sylvestre Ledru <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, default-jdk,
- openjdk-6-jdk | openjdk-7-jdk,
+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
diff -Nru jhdf-2.8.0/debian/patches/source1.5.diff jhdf-2.8.0/debian/patches/source1.5.diff
--- jhdf-2.8.0/debian/patches/source1.5.diff 2012-02-28 20:30:03.000000000 +0000
+++ jhdf-2.8.0/debian/patches/source1.5.diff 2012-08-01 17:44:06.000000000 +0100
@@ -7,7 +7,7 @@
OUT_DIR=$(CLASS_DIR)/$(DIR)
-JFLAGS= -g -deprecation -d $(CLASS_DIR) -classpath $(CP)
-+JFLAGS= -source 1.5 -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
