Author: malat Date: 2014-03-20 20:58:00 +0000 (Thu, 20 Mar 2014) New Revision: 16488
Added: trunk/packages/vtk-dicom/trunk/debian/common.1.in trunk/packages/vtk-dicom/trunk/debian/dicomdump.1 trunk/packages/vtk-dicom/trunk/debian/dicomtonifti.1 trunk/packages/vtk-dicom/trunk/debian/niftidump.1 trunk/packages/vtk-dicom/trunk/debian/niftitodicom.1 trunk/packages/vtk-dicom/trunk/debian/patches/ trunk/packages/vtk-dicom/trunk/debian/patches/final.patch trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch trunk/packages/vtk-dicom/trunk/debian/patches/series Modified: trunk/packages/vtk-dicom/trunk/debian/control trunk/packages/vtk-dicom/trunk/debian/rules Log: import last changes Added: trunk/packages/vtk-dicom/trunk/debian/common.1.in =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/common.1.in (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/common.1.in 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,3 @@ +[AUTHOR] +This manual page was written by Mathieu Malaterre <[email protected]> for +the Debian GNU/Linux system, but may be used by others. Modified: trunk/packages/vtk-dicom/trunk/debian/control =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/control 2014-03-20 19:57:53 UTC (rev 16487) +++ trunk/packages/vtk-dicom/trunk/debian/control 2014-03-20 20:58:00 UTC (rev 16488) @@ -2,16 +2,41 @@ Section: graphics Priority: optional Maintainer: Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9), cmake, libvtk5-dev, libgdcm2-dev, libdcmtk-dev, help2man Homepage: http://github.com/dgobbi/vtk-dicom/ Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/vtk-dicom/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/vtk-dicom/trunk Standards-Version: 3.9.5 -Package: vtk-dicom +Package: libvtk-dicom0.4-dev +Section: libdevel Architecture: any +Depends: ${misc:Depends}, libvtk-dicom0.4 (= ${binary:Version}) +Description: DICOM for VTK - dev + This package contains a set of classes for managing DICOM + files and metadata from within VTK, and some utility programs + for interrogating and converting DICOM files. + . + Development headers + +Package: libvtk-dicom0.4 +Section: libs +Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Description: DICOM for VTK +Description: DICOM for VTK - lib This package contains a set of classes for managing DICOM files and metadata from within VTK, and some utility programs for interrogating and converting DICOM files. + . + Libraries for runtime applications + +Package: vtk-dicom-tools +Section: utils +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: DICOM for VTK - tools + This package contains a set of classes for managing DICOM + files and metadata from within VTK, and some utility programs + for interrogating and converting DICOM files. + . + Command line tools Added: trunk/packages/vtk-dicom/trunk/debian/dicomdump.1 =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/dicomdump.1 (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/dicomdump.1 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,11 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH DICOMDUMP "1" "March 2014" "dicomdump 0.4.2" "User Commands" +.SH NAME +dicomdump \- manual page for dicomdump 0.4.2 +.SH DESCRIPTION +ERROR: In \fI/home/mathieu/debian/debian\-med/trunk/packages/vtk\-dicom/trunk/vtk\-dicom\-0.4.2/vtkDICOMSorter.cxx\fP, line 507 +vtkDICOMSorter (0x200bd20): ERROR: In \fI/home/mathieu/debian/debian\-med/trunk/packages/vtk\-dicom/trunk/vtk\-dicom\-0.4.2/vtkDICOMParser.cxx\fP, line 1345 +vtkDICOMParser (0x200c200): ReadFile: Can't open file \fB\-\-help\fR +.SH AUTHOR +This manual page was written by Mathieu Malaterre <[email protected]> for +the Debian GNU/Linux system, but may be used by others. Added: trunk/packages/vtk-dicom/trunk/debian/dicomtonifti.1 =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/dicomtonifti.1 (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/dicomtonifti.1 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,101 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH DICOMTONIFTI "1" "March 2014" "dicomtonifti 0.4.2" "User Commands" +.SH NAME +dicomtonifti \- manual page for dicomtonifti 0.4.2 +.SH DESCRIPTION +dicomtonifti 0.4.2 (HEAD , 20 Mar 2014, 20:37:31) +usage: dicomtonifti \fB\-o\fR file.nii file1.dcm [file2.dcm ...] +.IP +dicomtonifti \fB\-o\fR directory \fB\-\-batch\fR file1.dcm [file2.dcm ...] +.SS "options:" +.TP +\fB\-o\fR <output.nii[.gz]> +The output file (or directory, if \fB\-\-batch\fR). +.TP +\fB\-z\fR \fB\-\-compress\fR +Compress output files. +.TP +\fB\-r\fR \fB\-\-recurse\fR +Recurse into subdirectories. +.TP +\fB\-b\fR \fB\-\-batch\fR +Do multiple series at once. +.TP +\fB\-s\fR \fB\-\-silent\fR +Do not echo output filenames. +.TP +\fB\-v\fR \fB\-\-verbose\fR +Verbose error reporting. +.TP +\fB\-L\fR \fB\-\-follow\-symlinks\fR +Follow symbolic links when recursing. +.TP +\fB\-\-fsl\fR +Reformat the image for use in FSL. +.TP +\fB\-\-reformat\-to\-axial\fR +Reformat the image into axial orientation. +.TP +\fB\-\-no\-slice\-reordering\fR +Never reorder the slices. +.TP +\fB\-\-no\-row\-reordering\fR +Never reorder the rows. +.TP +\fB\-\-no\-column\-reordering\fR +Never reorder the columns. +.TP +\fB\-\-no\-reordering\fR +Never reorder slices, rows, or columns. +.TP +\fB\-\-no\-qform\fR +Don't include a qform in the NIFTI file. +.TP +\fB\-\-no\-sform\fR +Don't include an sform in the NIFTI file. +.TP +\fB\-\-version\fR +Print the version and exit. +.TP +\fB\-\-help\fR +Documentation for dicomtonifti. +.PP +This program will convert a DICOM series into a NIfTI file. +.PP +It reads the DICOM Position and Orientation metadata, and uses this +information to generate qform and sform entries for the NIfTI header, +after doing a conversion from the DICOM coordinate system to the NIfTI +coordinate system. +.PP +By default, it will also reorder the columns of the image so that +columns with higher indices are further to the patient's right (or +in the case of sagittal images, further anterior). Likewise, rows +will be rearranged so that rows with higher indices are superior (or +anterior for axial images). Finally, it will reorder the slices +so that the column direction, row direction, and slice direction +follow the right\-hand rule. +.PP +It is also possible to reformat the images into the axial orientation +via the \fB\-\-reformat\-to\-axial\fR option This option is mutually exclusive +with the no\-reordering options. The resulting orientation matrix will +be the identity matrix. +.PP +If the output NIFTI files are to be used with the FMRIB FSL package, +then use the \fB\-\-fsl\fR option to reformat the images to match the standard +FSL orientation: axial images with the slices arranged from inferior to +superior, column number increasing from right to left, and row number +increasing from posterior to anterior. This will also convert the data +type from unsigned 16\-bit to signed 16\-bit if necessary. +.PP +If batch mode is enabled, then the filenames will automatically be +generated from the series description in the DICOM meta data: +"PatientName/StudyDescription\-ID/SeriesDescription_N.nii.gz". +.PP +Here is an example of batch mode that recurses into subdirectories +and compresses the output files, putting the results in the current +directory: +.PP +dicomtonifti \fB\-brz\fR \fB\-o\fR . \fI/path/to/dicom/files\fP +.SH AUTHOR +This manual page was written by Mathieu Malaterre <[email protected]> for +the Debian GNU/Linux system, but may be used by others. Added: trunk/packages/vtk-dicom/trunk/debian/niftidump.1 =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/niftidump.1 (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/niftidump.1 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,32 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH NIFTIDUMP "1" "March 2014" "niftidump 0.4.2" "User Commands" +.SH NAME +niftidump \- manual page for niftidump 0.4.2 +.SH DESCRIPTION +ERROR: In \fI/home/mathieu/debian/debian\-med/trunk/packages/vtk\-dicom/trunk/vtk\-dicom\-0.4.2/vtkNIFTIReader.cxx\fP, line 431 +vtkNIFTIReader (0x2777c90): Unable to locate header for file \fB\-\-help\fR +.PP +ERROR: In \fI/tmp/buildd/vtk6\-6.0.0/Common/ExecutionModel/vtkExecutive.cxx\fP, line 754 +vtkCompositeDataPipeline (0x2778540): Algorithm vtkNIFTIReader(0x2777c90) returned failure for request: vtkInformation (0x276b5c0) +.IP +Debug: Off +Modified Time: 93 +Reference Count: 1 +Registered Events: (none) +Request: REQUEST_INFORMATION +ALGORITHM_AFTER_FORWARD: 1 +FORWARD_DIRECTION: 0 +.PP +sizeof_hdr: 348 +vox_offset: 0 +dim_info: 0x0 (unknown) +dim: 0 0 0 0 0 0 0 0 +pixdim: 0 0 0 0 0 0 0 0 +xyzt_units: 0x0 (unknown, unknown) +datatype: 0 () +bitpix: 0 +descrip: "" +aux_file: "" +.SH AUTHOR +This manual page was written by Mathieu Malaterre <[email protected]> for +the Debian GNU/Linux system, but may be used by others. Added: trunk/packages/vtk-dicom/trunk/debian/niftitodicom.1 =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/niftitodicom.1 (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/niftitodicom.1 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,66 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH NIFTITODICOM "1" "March 2014" "niftitodicom 0.4.2" "User Commands" +.SH NAME +niftitodicom \- manual page for niftitodicom 0.4.2 +.SH DESCRIPTION +niftitodicom 0.4.2 (HEAD , 20 Mar 2014, 20:37:31) +usage: niftitodicom \fB\-o\fR directory file.nii [file.dcm ...] +options: +.TP +\fB\-o\fR directory +The output directory. +.TP +\fB\-s\fR \fB\-\-silent\fR +Do not print anything while executing. +.TP +\fB\-v\fR \fB\-\-verbose\fR +Verbose error reporting. +.TP +\fB\-\-no\-reordering\fR +Never reorder slices, rows, or columns. +.TP +\fB\-\-axial\fR +Produce axial slices. +.TP +\fB\-\-coronal\fR +Produce coronal slices. +.TP +\fB\-\-sagittal\fR +Produce satittal slices. +.TP +\fB\-\-series\-description\fR +Textual description of the series. +.TP +\fB\-\-series\-number\fR +The series number ot use. +.TP +\fB\-\-modality\fR +The modality: MR or CT or SC. +.TP +\fB\-\-uid\-prefix\fR +A DICOM uid prefix (optional). +.TP +\fB\-\-help\fR +Documentation for niftitodicom. +.PP +This program will convert a NIfTI file into a DICOM series. +.PP +It reads the NIfTI file header and does the best job that it can to +generate a series of DICOM files. To help it along, you can provide +a DICOM file from the same series on the command line after the NIfTI +file, or even better, list all of the DICOM files that were used as +the source of the data in the NIfTI file. Study\-related meta data will +be copied from these DICOM files into the output DICOM files. +.PP +Unless the \fB\-\-no\-reordering\fR option is provided, it will ensure that +the images are in the usual orientation (right is left, posterior is +down) by reordering the columns or rows as compared to the NIFTI file. +.PP +If the NIFTI file is floating\-point, then the data might be rescaled +when written to DICOM as 16\-bit integers. If any data values are too +large to fit into 16 bits, then all the data will be scaled down. If +the data values all have a magnitude smaller than 2.05, then all the +data will be scaled up by a factor of 1000. +.SH AUTHOR +This manual page was written by Mathieu Malaterre <[email protected]> for +the Debian GNU/Linux system, but may be used by others. Added: trunk/packages/vtk-dicom/trunk/debian/patches/final.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/final.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/final.patch 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,37 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk-dicom (0.4.2-1) unstable; urgency=low + . + * Initial release. (Closes: #742217) +Author: Mathieu Malaterre <[email protected]> +Bug-Debian: http://bugs.debian.org/742217 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-dicom-0.4.2.orig/CMakeLists.txt ++++ vtk-dicom-0.4.2/CMakeLists.txt +@@ -123,7 +123,7 @@ set(DICOM_BIN_DIR "/bin") # for executab + set(DICOM_ARC_DIR "/lib") # for static or ".lib" libraries + set(DICOM_INC_DIR "/include") # for header files + set(DICOM_DATA_DIR "/share/dicom-${DICOM_SHORT_VERSION}") +-set(DICOM_CMAKE_DIR "/lib/dicom-${DICOM_SHORT_VERSION}/cmake") ++set(DICOM_CMAKE_DIR "${DICOM_LIB_DIR}/dicom-${DICOM_SHORT_VERSION}/cmake") + + # Set the full paths to the install tree + set(DICOM_RUNTIME_INSTALL_DEST ${CMAKE_INSTALL_PREFIX}${DICOM_BIN_DIR}) Added: trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,39 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk-dicom (0.4.2-1) unstable; urgency=low + . + * Initial release. (Closes: #) +Author: Mathieu Malaterre <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-dicom-0.4.2.orig/CMakeLists.txt ++++ vtk-dicom-0.4.2/CMakeLists.txt +@@ -153,9 +153,9 @@ set(LIB_NAME vtkDICOM) + + # The library dependencies + if("${VTK_MAJOR_VERSION}" GREATER 5) +- set(VTK_LIBS vtkIOImage vtksys vtkzlib) # VTK 6.x ++ set(VTK_LIBS vtkIOMPIImage vtkIOImage vtksys ) # VTK 6.x + else() +- set(VTK_LIBS vtkIO vtksys vtkzlib) # VTK 5.x ++ set(VTK_LIBS vtkIO vtksys ) # VTK 5.x + endif() + + if(WIN32) Added: trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,37 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk-dicom (0.4.2-1) unstable; urgency=low + . + * Initial release. (Closes: #742217) +Author: Mathieu Malaterre <[email protected]> +Bug-Debian: http://bugs.debian.org/742217 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-dicom-0.4.2.orig/CMakeLists.txt ++++ vtk-dicom-0.4.2/CMakeLists.txt +@@ -119,7 +119,7 @@ endif() + + # Set up our target directory structure for "make install" + set(DICOM_BIN_DIR "/bin") # for executables and ".dll" libraries +-set(DICOM_LIB_DIR "/lib") # for unix/linux/osx shared libraries ++#set(DICOM_LIB_DIR "/lib") # for unix/linux/osx shared libraries + set(DICOM_ARC_DIR "/lib") # for static or ".lib" libraries + set(DICOM_INC_DIR "/include") # for header files + set(DICOM_DATA_DIR "/share/dicom-${DICOM_SHORT_VERSION}") Added: trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,96 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk-dicom (0.4.2-1) unstable; urgency=low + . + * Initial release. (Closes: #742217) +Author: Mathieu Malaterre <[email protected]> +Bug-Debian: http://bugs.debian.org/742217 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-dicom-0.4.2.orig/CMakeLists.txt ++++ vtk-dicom-0.4.2/CMakeLists.txt +@@ -259,6 +259,8 @@ endif() + # Create the library + add_library(${LIB_NAME} ${LIB_SRCS} ${LIB_HIERARCHY_STAMP}) + target_link_libraries(${LIB_NAME} ${VTK_LIBS} ${GDCM_LIBS} ${DCMTK_LIBS}) ++set(LIBRARY_PROPERTIES VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}") ++set_target_properties(${LIB_NAME} PROPERTIES ${LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "") + set(DICOM_LIBRARIES ${LIB_NAME}) + + # Wrappers +--- vtk-dicom-0.4.2.orig/Examples/CMakeLists.txt ++++ vtk-dicom-0.4.2/Examples/CMakeLists.txt +@@ -8,27 +8,27 @@ else() + endif() + + add_executable(TestDICOMCompiler TestDICOMCompiler.cxx) +-target_link_libraries(TestDICOMCompiler vtkDICOM) ++target_link_libraries(TestDICOMCompiler vtkDICOM vtkCommonCore vtksys) + + add_executable(TestDICOMDirectory TestDICOMDirectory.cxx) +-target_link_libraries(TestDICOMDirectory vtkDICOM) ++target_link_libraries(TestDICOMDirectory vtkDICOM vtkCommonCore) + + add_executable(TestDICOMParser TestDICOMParser.cxx) +-target_link_libraries(TestDICOMParser vtkDICOM) ++target_link_libraries(TestDICOMParser vtkDICOM vtkCommonCore) + + add_executable(TestDICOMSorter TestDICOMSorter.cxx) +-target_link_libraries(TestDICOMSorter vtkDICOM) ++target_link_libraries(TestDICOMSorter vtkDICOM vtkCommonCore) + + add_executable(TestDICOMReader TestDICOMReader.cxx) +-target_link_libraries(TestDICOMReader vtkDICOM) ++target_link_libraries(TestDICOMReader vtkDICOM vtkCommonCore vtkIOMPIImage) + + add_executable(TestDICOMWriter TestDICOMWriter.cxx) +-target_link_libraries(TestDICOMWriter vtkDICOM) ++target_link_libraries(TestDICOMWriter vtkDICOM vtkIOMPIImage) + + if(VTK_MAJOR_VERSION GREATER 5 OR VTK_MINOR_VERSION GREATER 9) + add_executable(TestDICOMDisplay TestDICOMDisplay.cxx) +-target_link_libraries(TestDICOMDisplay vtkDICOM ${VTK_LIBS}) ++target_link_libraries(TestDICOMDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage) + + add_executable(TestNIFTIDisplay TestNIFTIDisplay.cxx) +-target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS}) ++target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage) + endif() +--- vtk-dicom-0.4.2.orig/Programs/CMakeLists.txt ++++ vtk-dicom-0.4.2/Programs/CMakeLists.txt +@@ -8,7 +8,7 @@ set(PROGRAM_SRCS + ) + + if("${VTK_MAJOR_VERSION}" GREATER 5) +- set(VTK_LIBS vtkImagingStatistics) # VTK 6.x ++ set(VTK_LIBS vtkIOImage vtkCommonCore vtkIOMPIImage vtkImagingStatistics) # VTK 6.x + else() + set(VTK_LIBS vtkImaging) # VTK 5.x + endif() +--- vtk-dicom-0.4.2.orig/Testing/CMakeLists.txt ++++ vtk-dicom-0.4.2/Testing/CMakeLists.txt +@@ -31,6 +31,6 @@ get_target_property(pth TestDICOMMetaDat + add_test(TestDICOMMetaData ${pth}/TestDICOMMetaData) + + add_executable(TestDICOMCharacterSet TestDICOMCharacterSet.cxx) +-target_link_libraries(TestDICOMCharacterSet vtkDICOM) ++target_link_libraries(TestDICOMCharacterSet vtkDICOM vtkCommonCore) + get_target_property(pth TestDICOMCharacterSet RUNTIME_OUTPUT_DIRECTORY) + add_test(TestDICOMCharacterSet ${pth}/TestDICOMCharacterSet) Added: trunk/packages/vtk-dicom/trunk/debian/patches/series =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/series (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-03-20 20:58:00 UTC (rev 16488) @@ -0,0 +1,4 @@ +fixcomp.patch +missingstuff.patch +lib.patch +final.patch Modified: trunk/packages/vtk-dicom/trunk/debian/rules =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/rules 2014-03-20 19:57:53 UTC (rev 16487) +++ trunk/packages/vtk-dicom/trunk/debian/rules 2014-03-20 20:58:00 UTC (rev 16488) @@ -1,8 +1,52 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + %: dh $@ --parallel +CMAKE_EXTRA_FLAGS += \ + -DCMAKE_SKIP_RPATH=OFF \ + -DDICOM_LIB_DIR:STRING=/lib/$(DEB_HOST_MULTIARCH) \ + -DCMAKE_BUILD_TYPE:STRING=None \ + -DBUILD_PYTHON_WRAPPERS:BOOL=OFF \ + -DBUILD_JAVA_WRAPPERS:BOOL=OFF \ + -DUSE_DCMTK:BOOL=ON \ + -DUSE_GDCM:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON + +override_dh_auto_configure: + dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) + +VERSION=0.4.2 +SOVERSION=0.4 +pkg_lib = libvtk-dicom$(SOVERSION) +pkg_dev = libvtk-dicom$(SOVERSION)-dev +pkg_bin = vtk-dicom-tools + +override_dh_install: + # bin + dh_install -p$(pkg_bin) --autodest usr/bin + # lib + dh_install -p$(pkg_lib) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/libvtkDICOM.so.* + # dev: + dh_install -p$(pkg_dev) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/libvtkDICOM.so + dh_install -p$(pkg_dev) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/dicom-0.4/cmake/*.cmake + dh_install -p$(pkg_dev) --autodest usr/include/ + dh_install --list-missing + +debian/%.1: debian/common.1.in + help2man --help-option=--help --include=$< --version-option=--version --version-string=$(VERSION) \ + --output=$@ --no-info --no-discard-stderr `basename $@ .1` + +manpages: debian/dicomdump.1 debian/dicomtonifti.1 debian/niftidump.1 debian/niftitodicom.1 + echo "manpages" + +build: manpages + +override_dh_installman: + dh_installman -p$(pkg_bin) debian/*.1 + get-orig-source: uscan --verbose --rename --force-download _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
