Package: dicomscope
Version: 3.6.0-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with OpenJDK7 (LP: #888932):
- d/patches/java7-compat.patch: Patch build to specify source/target
as 1.5 to ensure backwards compatibility and work around Java 7
encoding errors.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJO4JyRAAoJEL/srsug59jDYVgQAJUNgML/OiO2ZQbFob1Nhkex
JyjjRd/UqVzQSBbMlNWNuYoQmKwvRxMRTJmfErUWcnJUQXHgvPwjd7QQ5tkblXB7
F1UxFpdoAa/SMnxBiJiPGPaIfiP/yrI5xCLibrBdHcYRlChu5abhlGnp+watpm0S
RP90QHpg19d/2UJM7eNa/KYka6DBbcTMqJqc8VBtQSQbyRZKZwvhGZGoHCi/l8H3
pGnT2Ud5ayU/yuOHJxu3a8o1p+HoCAYlNK9AGGUPfdrCdGPkpStthpti8sJENV03
wsrGT9D/+m4peePCRiKRt4nAspVtKZlKg9sdlebccjhF2p2C/GIfjwGKD4V0NiCB
3roOMNEJwkHgtDtgJXmYQfwP2QcCH9tVbsu1rUiTqHruMDFDNjl118QgiXnpXbY2
bZ49NCXslNcriz+/YHYUkJW7fM25XrUsToNvysV854Qa7rz5GvGZbglJ0NiiraWS
mzTwYbmC4YLcT/BS6huQdx+1uXMs1ad43QJOzxJUbFyj7bphhcHmwjzbwup1PO6C
2SnKRIFcge6DMh09j5ZCk45ewHn6rxCaw248RYrEsDRb9dOnmatAfq1i13KNQk0D
zfYx3VEea2L5jcJ80n4IXqJ4QXqbVXHLVFC0b8ZP4Qs0jy7/NbXguJrN70EDe1yw
yJ5WutmL8FEnhDa8s/c4
=SWtf
-----END PGP SIGNATURE-----
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/java7-compat.patch 2011-12-08 11:05:57 +0000
@@ -0,0 +1,13 @@
+Index: dicomscope/tkgui/CMakeLists.txt
+===================================================================
+--- dicomscope.orig/tkgui/CMakeLists.txt 2011-12-08 10:55:29.070163000 +0000
++++ dicomscope/tkgui/CMakeLists.txt 2011-12-08 11:05:55.217488642 +0000
+@@ -10,7 +10,7 @@
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
+- COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . dicomscope/DICOMscope.java
++ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ${javafiles}
+ COMMENT "javac *.java"
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-02-09 11:04:47 +0000
+++ debian/patches/series 2011-12-08 11:05:24 +0000
@@ -8,3 +8,4 @@
DSRDocument.cpp.patch
dicom_2009.patch
log4cplus.patch
+java7-compat.patch
