This is an automated email from the git hooks/post-receive script. jodogne-guest pushed a commit to branch master in repository orthanc-wsi.
commit dacfa3b5a3fca0aa44ffb1defff63d9d8334716f Author: jodogne-guest <[email protected]> Date: Wed Oct 4 11:14:01 2017 +0200 moving patches done directly in the source code, to debian/patches --- Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake | 3 --- debian/patches/dcmtk-3.6.1~20170228.patch | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake index c6e2f3d..8534a93 100644 --- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake +++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake @@ -266,7 +266,6 @@ else() -DHAVE_CONFIG_H=1 ) - SET(DCMTK_config_INCLUDE_DIR ${DCMTK_INCLUDE_DIR}/dcmtk/config) if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux @@ -301,8 +300,6 @@ if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES) if (DCMTK_DICTIONARY_DIR STREQUAL "") find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic /usr/share/dcmtk - /usr/share/libdcmtk12 - /usr/share/libdcmtk11 /usr/share/libdcmtk1 /usr/share/libdcmtk2 /usr/share/libdcmtk3 diff --git a/debian/patches/dcmtk-3.6.1~20170228.patch b/debian/patches/dcmtk-3.6.1~20170228.patch index 5f38322..b72475f 100644 --- a/debian/patches/dcmtk-3.6.1~20170228.patch +++ b/debian/patches/dcmtk-3.6.1~20170228.patch @@ -1,4 +1,4 @@ -Description: Fix finding and compiling against dcmtk-201702028 +Description: Fix finding and compiling against dcmtk 3.6.2 Author: Gert Wollny <[email protected]> --- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake +++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake @@ -10,10 +10,11 @@ Author: Gert Wollny <[email protected]> if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux -@@ -300,6 +301,7 @@ +@@ -300,6 +301,8 @@ if (DCMTK_DICTIONARY_DIR STREQUAL "") find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic /usr/share/dcmtk ++ /usr/share/libdcmtk12 + /usr/share/libdcmtk11 /usr/share/libdcmtk1 /usr/share/libdcmtk2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-wsi.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
