Sebastien Jodogne pushed to branch master at Debian Med / orthanc-imagej
Commits: f161fe60 by jodogne-guest at 2025-09-01T13:44:36+02:00 fix FTBFS with recent versions of CMake - - - - - 67357832 by jodogne-guest at 2025-09-01T13:53:04+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - debian/copyright - debian/patches/cmake Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +orthanc-imagej (1.2+dfsg-5) unstable; urgency=medium + + * Fix FTBFS with recent versions of CMake (Closes: #1113372) + + -- Sebastien Jodogne <[email protected]> Mon, 01 Sep 2025 13:39:53 +0200 + orthanc-imagej (1.2+dfsg-4) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends: cmake, libij-java, libjson-simple-java Rules-Requires-Root: no -Standards-Version: 4.5.1 +Standards-Version: 4.7.2 Vcs-Browser: https://salsa.debian.org/med-team/orthanc-imagej Vcs-Git: https://salsa.debian.org/med-team/orthanc-imagej.git Homepage: https://orthanc.uclouvain.be/book/integrations/imagej.html ===================================== debian/copyright ===================================== @@ -5,10 +5,10 @@ Source: https://bitbucket.org/sjodogne/orthanc-imagej/ Files-Excluded: org/* Files: * -Copyright: 2012-2016 CHU of Liege (Belgium), and Sebastien Jodogne <[email protected]> -License: GPL-3 +Copyright: 2012-2018 CHU of Liege (Belgium), and Sebastien Jodogne <[email protected]> +License: GPL-3.0+ -License: GPL-3 +License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at @@ -20,8 +20,7 @@ License: GPL-3 General Public License for more details. . You should have received a copy of the GNU General Public License along - with this package; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + with this package. If not, see <https://www.gnu.org/licenses/>. . On Debian systems, the full text of the GNU General Public License version 3 can be found in the file ===================================== debian/patches/cmake ===================================== @@ -1,18 +1,24 @@ Description: Patch to link against Debian's libjson-simple-java package, compatibility with OpenJDK >= 21 Author: Sebastien Jodogne <[email protected]> +Forwarded: https://orthanc.uclouvain.be/hg/orthanc-imagej/rev/75b057e9cff0 --- 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 -@@ -5,8 +5,8 @@ project(Orthanc_Import) +@@ -1,12 +1,12 @@ +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required (VERSION 2.8...4.0) + + project(Orthanc_Import) + find_package(Java REQUIRED) include(UseJava) -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" "8" "-target" "8") ++set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8") +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 View it on GitLab: https://salsa.debian.org/med-team/orthanc-imagej/-/compare/c32c9ad63d53aa236b93055f80f3afe63e7beb02...673578321c7ba8f678d60df919047b98be27d9be -- View it on GitLab: https://salsa.debian.org/med-team/orthanc-imagej/-/compare/c32c9ad63d53aa236b93055f80f3afe63e7beb02...673578321c7ba8f678d60df919047b98be27d9be 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
