Author: jodogne-guest Date: 2015-11-10 16:05:29 +0000 (Tue, 10 Nov 2015) New Revision: 20477
Added: trunk/packages/orthanc/trunk/debian/patches/find-dictionary Modified: trunk/packages/orthanc/trunk/debian/changelog trunk/packages/orthanc/trunk/debian/control trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides trunk/packages/orthanc/trunk/debian/patches/series trunk/packages/orthanc/trunk/debian/rules Log: fix #804571 Modified: trunk/packages/orthanc/trunk/debian/changelog =================================================================== --- trunk/packages/orthanc/trunk/debian/changelog 2015-11-10 14:20:15 UTC (rev 20476) +++ trunk/packages/orthanc/trunk/debian/changelog 2015-11-10 16:05:29 UTC (rev 20477) @@ -1,3 +1,9 @@ +orthanc (0.9.4+dfsg-2) UNRELEASED; urgency=medium + + * Build-depend on libdcmtk-dev instead of libdcmtk2-dev. Closes: #804571 + + -- Sebastien Jodogne <[email protected]> Tue, 10 Nov 2015 16:23:28 +0100 + orthanc (0.9.4+dfsg-1) unstable; urgency=medium * New upstream version Modified: trunk/packages/orthanc/trunk/debian/control =================================================================== --- trunk/packages/orthanc/trunk/debian/control 2015-11-10 14:20:15 UTC (rev 20476) +++ trunk/packages/orthanc/trunk/debian/control 2015-11-10 16:05:29 UTC (rev 20477) @@ -13,7 +13,7 @@ libboost-all-dev, libcharls-dev, libcurl4-openssl-dev | libcurl4-dev, - libdcmtk2-dev, + libdcmtk-dev, libgtest-dev (>= 1.6.0), libjpeg-dev, libjs-jquery (>= 1.7.2), Modified: trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides =================================================================== --- trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides 2015-11-10 14:20:15 UTC (rev 20476) +++ trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides 2015-11-10 16:05:29 UTC (rev 20477) @@ -9,4 +9,3 @@ # "libServeFolders.so" shared library is placed inside # "/usr/lib/orthanc", that lintian seems not to scan postinst-has-useless-call-to-ldconfig -postrm-has-useless-call-to-ldconfig Added: trunk/packages/orthanc/trunk/debian/patches/find-dictionary =================================================================== --- trunk/packages/orthanc/trunk/debian/patches/find-dictionary (rev 0) +++ trunk/packages/orthanc/trunk/debian/patches/find-dictionary 2015-11-10 16:05:29 UTC (rev 20477) @@ -0,0 +1,67 @@ +Description: Fix when looking for the DICOM dictionary +Author: Sebastien Jodogne <[email protected]> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake +=================================================================== +--- Orthanc-0.9.4.orig/Resources/CMake/DcmtkConfiguration.cmake 2015-09-16 16:53:23.000000000 +0200 ++++ Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake 2015-11-10 16:38:30.016776426 +0100 +@@ -3,9 +3,14 @@ + find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic + /usr/share/dcmtk + /usr/share/libdcmtk2 ++ /usr/share/libdcmtk4 + /usr/local/share/dcmtk + ) + ++ if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND") ++ message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system") ++ endif() ++ + message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}") + add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}") + else() +@@ -15,6 +20,7 @@ + + if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) + SET(DCMTK_VERSION_NUMBER 360) ++ set(DCMTK_PACKAGE_VERSION "3.6.0") + SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) + SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip";) + SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4") +@@ -30,7 +36,7 @@ + IF (CMAKE_CROSSCOMPILING) + SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") + ENDIF() +- SET(DCMTK_SOURCE_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) ++ SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR}) + include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake) + include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake) + +@@ -47,9 +53,8 @@ + set(HAVE_PROTOTYPE_GETSOCKNAME 1) + endif() + +- set(DCMTK_PACKAGE_VERSION "3.6.0") + set(DCMTK_PACKAGE_VERSION_SUFFIX "") +- set(DCMTK_PACKAGE_VERSION_NUMBER 360) ++ set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER}) + + CONFIGURE_FILE( + ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in +@@ -155,13 +160,13 @@ + + #set_source_files_properties(${DCMTK_SOURCES} + # PROPERTIES COMPILE_DEFINITIONS +- # "PACKAGE_VERSION=\"3.6.0\";PACKAGE_VERSION_NUMBER=\"360\"") ++ # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"") + + # This fixes crashes related to the destruction of the DCMTK OFLogger + # http://support.dcmtk.org/docs-snapshot/file_macros.html + add_definitions( + -DLOG4CPLUS_DISABLE_FATAL=1 +- -DDCMTK_VERSION_NUMBER=360 ++ -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER} + ) + + include_directories( Modified: trunk/packages/orthanc/trunk/debian/patches/series =================================================================== --- trunk/packages/orthanc/trunk/debian/patches/series 2015-11-10 14:20:15 UTC (rev 20476) +++ trunk/packages/orthanc/trunk/debian/patches/series 2015-11-10 16:05:29 UTC (rev 20477) @@ -0,0 +1 @@ +find-dictionary Modified: trunk/packages/orthanc/trunk/debian/rules =================================================================== --- trunk/packages/orthanc/trunk/debian/rules 2015-11-10 14:20:15 UTC (rev 20476) +++ trunk/packages/orthanc/trunk/debian/rules 2015-11-10 16:05:29 UTC (rev 20477) @@ -21,7 +21,6 @@ -DSTANDALONE_BUILD:BOOL=ON \ -DUSE_SYSTEM_MONGOOSE:BOOL=OFF \ -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \ - -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \ -DDCMTK_LIBRARIES:STRING=dcmjpls \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \ -DCMAKE_BUILD_TYPE="" _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
