Sebastien Jodogne pushed to branch master at Debian Med / orthanc-imagej
Commits: 2b24a703 by jodogne-guest at 2021-02-05T15:54:05+01:00 preparing for 1.2+dfsg-3 - - - - - 1febdf27 by jodogne-guest at 2021-02-05T16:01:31+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/json-simple → debian/patches/cmake - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +orthanc-imagej (1.2+dfsg-3) unstable; urgency=medium + + * Compatibility with OpenJDK >= 12. (Closes: #981958) + + -- Sebastien Jodogne <[email protected]> Fri, 05 Feb 2021 15:52:59 +0100 + orthanc-imagej (1.2+dfsg-2) unstable; urgency=medium [ Gilles Filippini ] ===================================== debian/control ===================================== @@ -9,7 +9,7 @@ Build-Depends: cmake, debhelper (>= 10), libij-java, libjson-simple-java -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/med-team/orthanc-imagej Vcs-Git: https://salsa.debian.org/med-team/orthanc-imagej.git Homepage: http://www.orthanc-server.com/static.php?page=imagej ===================================== debian/patches/json-simple → debian/patches/cmake ===================================== @@ -1,16 +1,18 @@ -Description: Patch to link against Debian's libjson-simple-java package -Author: Sebastien Jodogne <[email protected]> +Description: Patch to link against Debian's libjson-simple-java package, compatibility with OpenJDK >= 12 +Author: Sebastien Jodogne <[email protected]> --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: OrthancImageJ-1.2/CMakeLists.txt =================================================================== --- OrthancImageJ-1.2.orig/CMakeLists.txt +++ OrthancImageJ-1.2/CMakeLists.txt -@@ -6,7 +6,7 @@ find_package(Java REQUIRED) +@@ -5,8 +5,8 @@ project(Orthanc_Import) + find_package(Java REQUIRED) include(UseJava) - set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6") +-set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6") -set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/ij.jar) ++set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.7" "-target" "1.7") +set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/ij.jar:/usr/share/java/json-simple.jar) # The name of an ImageJ plugin must contain an underscore ===================================== debian/patches/series ===================================== @@ -1,2 +1,2 @@ -json-simple +cmake json-simple-3.patch View it on GitLab: https://salsa.debian.org/med-team/orthanc-imagej/-/compare/8ca67a6c6a178deb5ff38df5fe090bd177ecc13d...1febdf27caa68ea14b4eafddfc5a29d7a1176519 -- View it on GitLab: https://salsa.debian.org/med-team/orthanc-imagej/-/compare/8ca67a6c6a178deb5ff38df5fe090bd177ecc13d...1febdf27caa68ea14b4eafddfc5a29d7a1176519 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
