This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository gdcm.
commit 9c45aea719283eb3698a56134532b40fabcd7b59 Author: Gert Wollny <[email protected]> Date: Thu Apr 21 08:15:52 2016 +0000 Enable build with minimum java version 1.5 --- debian/changelog | 2 +- debian/control | 2 +- debian/patches/09_set_java_15.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index de99758..a030fb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ gdcm (2.6.3-4) UNRELEASED; urgency=medium * d/p/08: Add patch to compile against VTK 6.3 - * d/control: Set minimum requirements for JAVA to 1.7 Closes: 821959 + * d/p/09: Set minimum requirements for JAVA to 1.5 Closes: 821959 -- Gert Wollny <[email protected]> Sun, 17 Apr 2016 09:12:56 +0000 diff --git a/debian/control b/debian/control index b329b39..dd9ccbb 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Andreas Tille <[email protected]>, Gert Wollny <[email protected]> Build-Depends: cmake (>= 2.8.9), debhelper (>= 9), - default-jdk (>= 1.7), + default-jdk, dh-strip-nondeterminism, dh-python, python-all-dev, diff --git a/debian/patches/09_set_java_15.patch b/debian/patches/09_set_java_15.patch new file mode 100644 index 0000000..132dbf1 --- /dev/null +++ b/debian/patches/09_set_java_15.patch @@ -0,0 +1,24 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -524,8 +524,8 @@ + option(GDCM_USE_JPEGLS "Build GDCM with JPEG-LS support" ON) + mark_as_advanced(GDCM_USE_JPEGLS) + if(GDCM_WRAP_JAVA) +- set(GDCM_JAVA_SOURCE_VERSION "1.7" CACHE STRING "javac source version") +- set(GDCM_JAVA_TARGET_VERSION "1.7" CACHE STRING "javac target version") ++ set(GDCM_JAVA_SOURCE_VERSION "1.5" CACHE STRING "javac source version") ++ set(GDCM_JAVA_TARGET_VERSION "1.5" CACHE STRING "javac target version") + mark_as_advanced(GDCM_JAVA_SOURCE_VERSION GDCM_JAVA_TARGET_VERSION) + endif() + if(GDCM_WRAP_CSHARP) +--- a/Wrapping/Java/CMakeLists.txt ++++ b/Wrapping/Java/CMakeLists.txt +@@ -14,7 +14,7 @@ + + # $ export JAVA_HOME=/usr/lib/j2sdk1.6-sun/ + # $ export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/ +-find_package(Java 1.7 REQUIRED) # javac, jar ++find_package(Java 1.5 REQUIRED) # javac, jar + find_package(JNI REQUIRED) + include_directories( + ${JNI_INCLUDE_DIRS} diff --git a/debian/patches/series b/debian/patches/series index c94d98a..bff6a08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,5 @@ 06_dcm_group2_buggyfiles_fallback.patch 07_don_t_link_vtkjava_modules.patch 08_supportvtk6.3.patch +09_set_java_15.patch + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
