[med-svn] r9443 - in trunk/packages/insighttoolkit/trunk/debian: . patches

Steven Michael Robbins smr at alioth.debian.org
Fri Jan 27 03:37:12 UTC 2012


Author: smr
Date: 2012-01-27 03:37:11 +0000 (Fri, 27 Jan 2012)
New Revision: 9443

Removed:
   trunk/packages/insighttoolkit/trunk/debian/patches/03_examples.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/docs
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Update for ITK 4.0.0.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,3 +1,12 @@
+insighttoolkit4 (4.0.0-1) unstable; urgency=low
+
+  * New upstream, major release.  Removed all patches.
+  
+  * rules: Reworked CMAKE_FLAGS from scratch.  Update for new install
+    practice: libs in /usr/lib, includes in /usr/include/ITK-4.0.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 26 Jan 2012 20:42:39 -0600
+
 insighttoolkit (3.20.1-2) unstable; urgency=low
 
   [ Mathieu Malaterre ]

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,4 +1,4 @@
-Source: insighttoolkit
+Source: insighttoolkit4
 Homepage: http://www.itk.org/
 Section: science
 Priority: optional
@@ -8,14 +8,14 @@
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev, libvxl1-dev,
- libfftw3-dev,
+ libfftw3-dev, libgeotiff-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 Standards-Version: 3.9.2
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/
 
-Package: libinsighttoolkit3.20
+Package: libinsighttoolkit4.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -32,14 +32,14 @@
  .
  This package contains the libraries needed to run ITK applications.
 
-Package: libinsighttoolkit3-dev
+Package: libinsighttoolkit4-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version}), libgdcm2-dev
+Depends: ${misc:Depends}, libinsighttoolkit4.0 (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev
 Replaces: libinsighttoolkit-dev
-Suggests: insighttoolkit3-examples
+Suggests: insighttoolkit4-examples
 Description: Image processing toolkit for registration and segmentation - development
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -54,11 +54,11 @@
  This package contains the development files needed to build your own
  ITK applications.
 
-Package: insighttoolkit3-examples
+Package: insighttoolkit4-examples
 Section: devel
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libinsighttoolkit3-dev
+Suggests: libinsighttoolkit4-dev
 Conflicts: insighttoolkit-examples
 Replaces: insighttoolkit-examples
 Description: Image processing toolkit for registration and segmentation - examples

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,4 +1,4 @@
-Source: insighttoolkit
+Source: insighttoolkit4
 Homepage: http://www.itk.org/
 Section: science
 Priority: optional
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev, libvxl1-dev,
- libfftw3-dev,
+ libfftw3-dev, libgeotiff-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 Standards-Version: 3.9.2

Modified: trunk/packages/insighttoolkit/trunk/debian/docs
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/docs	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/docs	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,4 +1,4 @@
 GettingStarted.txt
-README.html
-InsightLogo.gif
+Documentation/README.html
+Documentation/InsightLogo.gif
 

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/03_examples.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/03_examples.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/03_examples.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,12 +0,0 @@
---- insighttoolkit-3.4.0.orig/Examples/CMakeLists.txt
-+++ insighttoolkit-3.4.0/Examples/CMakeLists.txt
-@@ -1,3 +1,9 @@
-+# Find ITK.
-+FIND_PACKAGE(ITK REQUIRED)
-+IF(ITK_FOUND)
-+  INCLUDE(${ITK_USE_FILE})
-+ENDIF(ITK_FOUND)
-+
- SUBDIRS( 
-   Iterators
-   DataRepresentation

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,28 +0,0 @@
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/WrapITKTypes.cmake
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/WrapITKTypes.cmake	2011-01-21 12:36:35.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/WrapITKTypes.cmake	2011-01-21 12:38:05.000000000 -0500
-@@ -80,6 +80,8 @@
- WRAP_TYPE("itk::Array" "A")
-   WRAP_TEMPLATE("${ITKM_D}" "${ITKT_D}")
-   WRAP_TEMPLATE("${ITKM_F}" "${ITKT_F}")
-+  WRAP_TEMPLATE("${ITKM_UL}" "${ITKT_UL}")
-+  WRAP_TEMPLATE("${ITKM_SL}" "${ITKT_SL}")
- END_WRAP_TYPE()
- SET(itk_Wrap_Array ${WRAPPER_TEMPLATES})
- 
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake	2011-01-21 12:38:49.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake	2011-01-21 12:39:15.000000000 -0500
-@@ -14,3 +14,10 @@
- WRAP_NON_TEMPLATE_CLASS("itk::RegularStepGradientDescentOptimizer" POINTER)
- WRAP_NON_TEMPLATE_CLASS("itk::VersorTransformOptimizer" POINTER)
- WRAP_NON_TEMPLATE_CLASS("itk::AmoebaOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::CumulativeGaussianOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::ExhaustiveOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::FRPROptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::LBFGSBOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::PowellOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::SPSAOptimizer" POINTER)
-+WRAP_NON_TEMPLATE_CLASS("itk::VersorRigid3DTransformOptimizer" POINTER)

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,46 +0,0 @@
-Description: Avoid undefined reference to `void_vnl_c_vector_inf_norm...'
- link error on HPPA.  This patch reverts upstream change
- http://vxl.svn.sourceforge.net/viewvc/vxl?view=rev&revision=11383
-Author: Denis Barbier <bouzim at gmail.com>
-Bug: 558998
-Forwarded: not yet
-
-
---- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/Templates/vnl_c_vector+long_double_complex-.cxx
-+++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/Templates/vnl_c_vector+long_double_complex-.cxx
-@@ -1,6 +1,4 @@
- #include <vnl/vnl_complex.h>
- #include <vnl/vnl_c_vector.txx>
- 
--#ifndef __hppa // bug in HP assembler?
- VNL_C_VECTOR_INSTANTIATE_unordered(vcl_complex<long double>);
--#endif
---- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx
-+++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx
-@@ -1,6 +1,4 @@
- #include <vcl_complex.h>
- #include <vnl/vnl_det.txx>
- 
--#ifndef __hppa // bug in HP assembler?
- VNL_DET_INSTANTIATE(vcl_complex<long double>);
--#endif
---- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/vnl_copy.cxx
-+++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/vnl_copy.cxx
-@@ -38,9 +38,7 @@
- VNL_COPY_INSTANTIATE0(float, double);
- VNL_COPY_INSTANTIATE0(double, float);
- VNL_COPY_INSTANTIATE0(double, long double);
--#ifndef __hppa // assembler bug on HP?
- VNL_COPY_INSTANTIATE0(long double, double);
--#endif
- 
- #define macro(S, D) \
- VCL_DEFINE_SPECIALIZATION \
-@@ -68,7 +66,5 @@
- 
- VNL_COPY_INSTANTIATE_twoway(float, double);
- VNL_COPY_INSTANTIATE_twoway(vcl_complex<float>, vcl_complex<double>);
--#ifndef __hppa // assembler bug on HP?
- VNL_COPY_INSTANTIATE_twoway(double, long double);
- VNL_COPY_INSTANTIATE_twoway(vcl_complex<double>, vcl_complex<long double>);
--#endif

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/jni-dir.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,11 +0,0 @@
---- insighttoolkit-3.16.0.orig/Wrapping/CSwig/Java/CMakeLists.txt	2006-10-26 14:59:48.000000000 -0500
-+++ insighttoolkit-3.16.0/Wrapping/CSwig/Java/CMakeLists.txt	2010-04-11 17:46:40.000000000 -0500
-@@ -5,7 +5,7 @@
- IF(WIN32)
-   SET(ITK_JAVA_INSTALL_DIR "/../../bin")
- ELSE(WIN32)
--  SET(ITK_JAVA_INSTALL_DIR "")
-+  SET(ITK_JAVA_INSTALL_DIR "/../../lib/jni")
- ENDIF(WIN32)
- 
- IF(CMAKE_CONFIGURATION_TYPES)

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,79 +0,0 @@
---- insighttoolkit-3.18.0.orig/CMakeLists.txt
-+++ insighttoolkit-3.18.0/CMakeLists.txt
-@@ -849,10 +849,6 @@
- CONFIGURE_FILE(${ITK_SOURCE_DIR}/UseITK.cmake.in
-                ${ITK_BINARY_DIR}/UseITK.cmake COPYONLY IMMEDIATE)
- 
--# Save the compiler settings so another project can import them.
--INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
--CMAKE_EXPORT_BUILD_SETTINGS(${ITK_BINARY_DIR}/ITKBuildSettings.cmake)
--
- # Save library dependencies.
- EXPORT_LIBRARY_DEPENDENCIES(${ITK_BINARY_DIR}/ITKLibraryDepends.cmake)
- 
-@@ -861,7 +857,6 @@
- 
- IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
-   INSTALL(FILES
--    ${ITK_BINARY_DIR}/ITKBuildSettings.cmake
-     ${ITK_BINARY_DIR}/ITKLibraryDepends.cmake
-     ${ITK_BINARY_DIR}/UseITK.cmake
-     DESTINATION ${ITK_INSTALL_PACKAGE_DIR_CM24}
---- insighttoolkit-3.18.0.orig/ITKConfig.cmake.in
-+++ insighttoolkit-3.18.0/ITKConfig.cmake.in
-@@ -25,9 +25,6 @@
- # The location of the UseITK.cmake file.
- SET(ITK_USE_FILE "@ITK_USE_FILE@")
- 
--# The build settings file.
--SET(ITK_BUILD_SETTINGS_FILE "@ITK_BUILD_SETTINGS_FILE@")
--
- # The library dependencies file.
- SET(ITK_LIBRARY_DEPENDS_FILE "@ITK_LIBRARY_DEPENDS_FILE@")
- 
---- insighttoolkit-3.18.0.orig/Testing/Code/Common/itkSystemInformationTest.cxx
-+++ insighttoolkit-3.18.0/Testing/Code/Common/itkSystemInformationTest.cxx
-@@ -140,7 +140,6 @@
-       ITK_SYSTEM_INFORMATION_DIR "/CMakeFiles/CMakeError.log",
-       ITK_SYSTEM_INFORMATION_DIR "/CMakeOutput.log",
-       ITK_SYSTEM_INFORMATION_DIR "/CMakeError.log",
--      ITK_SYSTEM_INFORMATION_DIR "/ITKBuildSettings.cmake",
-       ITK_SYSTEM_INFORMATION_DIR "/ITKLibraryDepends.cmake",
-       ITK_SYSTEM_INFORMATION_DIR "/ITKConfig.cmake",
-       0
---- insighttoolkit-3.18.0.orig/UseITK.cmake.in
-+++ insighttoolkit-3.18.0/UseITK.cmake.in
-@@ -5,11 +5,6 @@
- # obtained from ITKConfig.cmake.
- #
- 
--IF(ITK_BUILD_SETTINGS_FILE AND NOT SKIP_ITK_BUILD_SETTINGS_FILE)
--  INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
--  CMAKE_IMPORT_BUILD_SETTINGS(${ITK_BUILD_SETTINGS_FILE})
--ENDIF(ITK_BUILD_SETTINGS_FILE AND NOT SKIP_ITK_BUILD_SETTINGS_FILE)
--
- # Add compiler flags needed to use ITK.
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ITK_REQUIRED_C_FLAGS}")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ITK_REQUIRED_CXX_FLAGS}")
---- insighttoolkit-3.18.0.orig/itkGenerateITKConfig.cmake
-+++ insighttoolkit-3.18.0/itkGenerateITKConfig.cmake
-@@ -39,9 +39,6 @@
- # The "use" file.
- SET(ITK_USE_FILE ${ITK_BINARY_DIR}/UseITK.cmake)
- 
--# The build settings file.
--SET(ITK_BUILD_SETTINGS_FILE ${ITK_BINARY_DIR}/ITKBuildSettings.cmake)
--
- # Library directory.
- SET(ITK_LIBRARY_DIRS_CONFIG ${ITK_LIBRARY_PATH})
- 
-@@ -74,9 +71,6 @@
- # The "use" file.
- SET(ITK_USE_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/UseITK.cmake)
- 
--# The build settings file.
--SET(ITK_BUILD_SETTINGS_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/ITKBuildSettings.cmake)
--
- # Include directories.
- SET(ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}${ITK_INSTALL_INCLUDE_DIR})
- FOREACH(DIR ${ITK_INCLUDE_RELATIVE_DIRS})

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,9 +0,0 @@
-hppa-complex-long-double.patch
-03_examples.patch
-tcl-install.patch
-jni-dir.patch
-remove-cmake-export-build-settings.patch
-wrapitk.patch
-wrapitk-externalprojects.patch
-add-registration-optimizers.patch
-wrap-iifilter-split.patch

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,26 +0,0 @@
-This patch lets us install all the shared libs for Tcl
-into /usr/lib.  However, maybe we could hide them somewhere
-else; e.g. /usr/lib/tcltk/???
-
---- insighttoolkit-3.20.0.orig/Wrapping/CSwig/CMakeLists.txt
-+++ insighttoolkit-3.20.0/Wrapping/CSwig/CMakeLists.txt
-@@ -352,7 +352,7 @@
- # Configure pkgIndex.tcl for the install tree.
- 
- SET(ITK_CSWIG_SCRIPT_DIR "[file dirname [info script]]")
--SET(ITK_CSWIG_PACKAGE_DIR "[file dirname [file dirname [info script]]]")
-+SET(ITK_CSWIG_PACKAGE_DIR "/usr/lib")
- SET(ITK_CSWIG_DATA_ROOT "[file dirname [file dirname [info script]]]/Data")
- SET(ITK_CSWIG_TEST_ROOT "<NO_DEFAULT>")
- CONFIGURE_FILE("${ITK_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Tcl/CMakeLists.txt
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Tcl/CMakeLists.txt
-@@ -37,7 +37,7 @@
- 
- # Configure pkgIndex.tcl for the install tree.
- SET(WRAP_ITK_SCRIPT_DIR "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/Tcl")
--SET(WRAP_ITK_PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/lib")
-+SET(WRAP_ITK_PACKAGE_DIR "/usr/lib")
- SET(WRAP_ITK_DATA_ROOT "${CMAKE_INSTALL_PREFIX}/${WRAP_ITK_INSTALL_PREFIX}/Data")
- SET(WRAP_ITK_TEST_ROOT "<NO_DEFAULT>")
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in"

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,116 +0,0 @@
-Description: Split ImageToImageFilterB into smaller modules
- to avoid compile problems.  The first version of this patch 
- was written by Gaëtan Lehmann to avoid compiler table overflow on
- certain architectures, solving build failure on the powerpc build daemon 
- "Error: operand out of range (0x0000000000008008 is not between 0xffffffffffff8000 and 0x0000000000007fff)"
- See details and links in http://lists.debian.org/debian-devel/2011/02/msg00179.html
- The filterB source file was further split in August 2011, introducing filterD.
-Author: Gaëtan Lehmann <gaetan.lehmann at jouy.inra.fr>
-Origin: http://lists.debian.org/debian-devel/2011/02/msg00188.html
-
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake
-@@ -12,42 +12,4 @@
-   WRAP_IMAGE_FILTER_COMBINATIONS("${stypes}" "${WRAP_ITK_RGBA}")
-   WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_RGBA}" "${stypes}")
-  
--  # VectorImage <-> scalar
--  UNIQUE(to_types "UC;${WRAP_ITK_SCALAR}")
--    FOREACH(d ${WRAP_ITK_DIMS})
--      FOREACH(t ${to_types})
--        FOREACH(t2 ${to_types})
--          WRAP_TEMPLATE("${ITKM_VI${t}${d}}${ITKM_I${t2}${d}}" "${ITKT_VI${t}${d}},${ITKT_I${t2}${d}}")
--          WRAP_TEMPLATE("${ITKM_I${t2}${d}}${ITKM_VI${t}${d}}" "${ITKT_I${t2}${d}},${ITKT_VI${t}${d}}")
--        ENDFOREACH(t2)
--      ENDFOREACH(t)
--    ENDFOREACH(d)
--      
--  # *Vector <-> scalar
--  WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}")
--  WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}")
--
--  # complex <-> scalar
--  IF(WRAP_complex_float AND WRAP_float)
--    WRAP_IMAGE_FILTER_TYPES(CF F)
--    WRAP_IMAGE_FILTER_TYPES(F CF)
--  ENDIF(WRAP_complex_float AND WRAP_float)
--
--  IF(WRAP_complex_double AND WRAP_double)
--    WRAP_IMAGE_FILTER_TYPES(CD D)
--    WRAP_IMAGE_FILTER_TYPES(D CD)
--  ENDIF(WRAP_complex_double AND WRAP_double)
--
--  # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc.
--  FOREACH(d ${WRAP_ITK_DIMS})    
--    FOREACH(d2 ${WRAP_ITK_DIMS})
--      IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere
--        FOREACH(t ${WRAP_ITK_SCALAR})
--          WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}"
--                        "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}")
--        ENDFOREACH(t)
--      ENDIF(NOT "${d}" EQUAL "${d2}")
--    ENDFOREACH(d2)
--  ENDFOREACH(d)
--
- END_WRAP_CLASS()
---- /dev/null
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterC.cmake
-@@ -0,0 +1,18 @@
-+WRAP_CLASS("itk::ImageToImageFilter" POINTER)
-+
-+  # VectorImage <-> scalar
-+  UNIQUE(to_types "UC;${WRAP_ITK_SCALAR}")
-+    FOREACH(d ${WRAP_ITK_DIMS})
-+      FOREACH(t ${to_types})
-+        FOREACH(t2 ${to_types})
-+          WRAP_TEMPLATE("${ITKM_VI${t}${d}}${ITKM_I${t2}${d}}" "${ITKT_VI${t}${d}},${ITKT_I${t2}${d}}")
-+          WRAP_TEMPLATE("${ITKM_I${t2}${d}}${ITKM_VI${t}${d}}" "${ITKT_I${t2}${d}},${ITKT_VI${t}${d}}")
-+        ENDFOREACH(t2)
-+      ENDFOREACH(t)
-+    ENDFOREACH(d)
-+      
-+  # *Vector <-> scalar
-+  WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}")
-+  WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}")
-+
-+END_WRAP_CLASS()
---- /dev/null
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterD.cmake
-@@ -0,0 +1,26 @@
-+WRAP_CLASS("itk::ImageToImageFilter" POINTER)
-+
-+  # complex <-> scalar
-+  IF(WRAP_complex_float AND WRAP_float)
-+    WRAP_IMAGE_FILTER_TYPES(CF F)
-+    WRAP_IMAGE_FILTER_TYPES(F CF)
-+  ENDIF(WRAP_complex_float AND WRAP_float)
-+
-+  IF(WRAP_complex_double AND WRAP_double)
-+    WRAP_IMAGE_FILTER_TYPES(CD D)
-+    WRAP_IMAGE_FILTER_TYPES(D CD)
-+  ENDIF(WRAP_complex_double AND WRAP_double)
-+
-+  # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc.
-+  FOREACH(d ${WRAP_ITK_DIMS})    
-+    FOREACH(d2 ${WRAP_ITK_DIMS})
-+      IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere
-+        FOREACH(t ${WRAP_ITK_SCALAR})
-+          WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}"
-+                        "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}")
-+        ENDFOREACH(t)
-+      ENDIF(NOT "${d}" EQUAL "${d2}")
-+    ENDFOREACH(d2)
-+  ENDFOREACH(d)
-+
-+END_WRAP_CLASS()
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/CMakeLists.txt
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/CMakeLists.txt
-@@ -24,6 +24,8 @@
-   itkImageSource
-   itkImageToImageFilterA
-   itkImageToImageFilterB
-+  itkImageToImageFilterC
-+  itkImageToImageFilterD
-   itkInPlaceImageFilterA
-   itkInPlaceImageFilterB
-   itkFiniteDifferenceImageFilter

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk-externalprojects.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,125 +0,0 @@
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/CMakeLists.txt
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/CMakeLists.txt	2011-01-09 14:12:59.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/CMakeLists.txt	2011-01-11 10:19:08.000000000 -0500
-@@ -176,6 +176,17 @@
-   SUBDIRS(Modules/${module})
- ENDFOREACH(module)
- 
-+OPTION(BUILD_ITKVTKGLUE "Build WrapITK with ItkVtkGlue" ON)
-+IF(BUILD_ITKVTKGLUE)
-+  SUBDIRS(ExternalProjects/ItkVtkGlue)
-+ENDIF(BUILD_ITKVTKGLUE)
-+
-+OPTION(BUILD_PYBUFFER "Build WrapITK with Numpy support" ON)
-+IF(BUILD_PYBUFFER)
-+  SUBDIRS(ExternalProjects/PyBuffer)
-+ENDIF(BUILD_PYBUFFER)
-+
-+
- ###############################################################################
- # Configure language-specific features
- ###############################################################################
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt	2011-01-11 10:12:29.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/CMakeLists.txt	2011-01-17 18:14:17.000000000 -0500
-@@ -1,29 +1,3 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
--IF(COMMAND CMAKE_POLICY)
--  CMAKE_POLICY(SET CMP0003 NEW)
--ENDIF(COMMAND CMAKE_POLICY)
--
--PROJECT(ItkVtkGlue)
--
--OPTION(BUILD_WRAPPERS "Wrap library" OFF)
--OPTION(INSTALL_DEVEL_FILES "Install C++ headers" ON)
--
--FIND_PACKAGE(ITK REQUIRED)
--FIND_PACKAGE(VTK REQUIRED)
--
--INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS} ${ITK_INCLUDE_DIRS} ${ItkVtkGlue_SOURCE_DIR}/src)
--LINK_DIRECTORIES(${VTK_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS})
--
--IF(BUILD_WRAPPERS)
--   SUBDIRS(Wrapping)
--ENDIF(BUILD_WRAPPERS)
--
--# install devel files
--IF(INSTALL_DEVEL_FILES)
--  FOREACH(f itkImageToVTKImageFilter.h itkImageToVTKImageFilter.txx itkVTKImageToImageFilter.h itkVTKImageToImageFilter.txx)
--    INSTALL_FILES(/include/InsightToolkit/BasicFilters FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/${f})
--  ENDFOREACH(f)
--ENDIF(INSTALL_DEVEL_FILES)
--
--ENABLE_TESTING()
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
-+SUBDIRS(Wrapping)
- 
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt	2011-01-11 10:52:39.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/CMakeLists.txt	2011-01-17 11:17:30.000000000 -0500
-@@ -1,11 +1,5 @@
--PROJECT(PyBuffer)
--FIND_PACKAGE(WrapITK REQUIRED)
--
- # Deal with numarray package  Options
--SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
--FIND_PACKAGE( NUMARRAY )
--
--INCLUDE_DIRECTORIES( ${PYTHON_NUMARRAY_INCLUDE_DIR} )
-+INCLUDE_DIRECTORIES( ${PYTHON_NUMPY_INCLUDE_PATH} )
- 
- BEGIN_WRAPPER_LIBRARY("BufferConversion" Python)
- 
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx	2011-01-11 14:49:57.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/PyBuffer/itkPyBuffer.txx	2011-01-11 14:50:43.000000000 -0500
-@@ -49,7 +49,7 @@
-  
-   char * data = (char *)( buffer );
-   
--  int dimensions[ ImageDimension ];
-+  npy_intp dimensions[ ImageDimension ];
-   
-   SizeType size = image->GetBufferedRegion().GetSize();
-   
-Index: insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt
-===================================================================
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt	2011-01-11 15:14:29.000000000 -0500
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/ExternalProjects/ItkVtkGlue/Wrapping/CMakeLists.txt	2011-01-17 11:23:37.000000000 -0500
-@@ -1,23 +1,19 @@
--FIND_PACKAGE(WrapITK REQUIRED)
- 
--BEGIN_WRAPPER_LIBRARY(${PROJECT_NAME})
-+BEGIN_WRAPPER_LIBRARY(ItkVtkGlue)
- SET(WRAPPER_SWIG_LIBRARY_FILES ${WRAPPER_SWIG_LIBRARY_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/itkvtk.swg")
- SET(WRAPPER_LIBRARY_DEPENDS Base SimpleFilters)
- 
--WRAPPER_LIBRARY_CREATE_WRAP_FILES()
--WRAPPER_LIBRARY_CREATE_LIBRARY()
--
- IF(WRAP_ITK_PYTHON)
-   # I can't manage to put that code in Python subdir :-(
-   SET(VTK_VERSION "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
--  SET(MIN_ITK_VER "5.0.0")
--  IF("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
--    TARGET_LINK_LIBRARIES(_${WRAPPER_LIBRARY_NAME}Python vtkImagingPython ITKCommon ITKBasicFilters)
--  ELSE("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
--    TARGET_LINK_LIBRARIES(_${WRAPPER_LIBRARY_NAME}Python vtkImagingPythonD ITKCommon ITKBasicFilters)
--  ENDIF("${VTK_VERSION}" STRLESS "${MIN_ITK_VER}")
--
--  SUBDIRS(Python)
-+  SET(MIN_VTK_VER "5.0.0")
-+  IF("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
-+    SET(WRAPPER_LIBRARY_LINK_LIBRARIES vtkImagingPython ITKCommon ITKBasicFilters)
-+  ELSE("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
-+    SET(WRAPPER_LIBRARY_LINK_LIBRARIES vtkImagingPythonD ITKCommon ITKBasicFilters)
-+  ENDIF("${VTK_VERSION}" STRLESS "${MIN_VTK_VER}")
- ENDIF(WRAP_ITK_PYTHON)
- 
-+WRAPPER_LIBRARY_CREATE_WRAP_FILES()
-+WRAPPER_LIBRARY_CREATE_LIBRARY()
- 

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,30 +0,0 @@
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/SwigRuntime/CMakeLists.txt
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/SwigRuntime/CMakeLists.txt
-@@ -13,7 +13,11 @@
-   ENDIF(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_IS_GNUCC)
- 
-   INSTALL_TARGETS("${WRAP_ITK_INSTALL_PREFIX}/lib" ${lib_name})
--  SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
-+  IF(ITK_LIBRARY_PROPERTIES)
-+    SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}" ${ITK_LIBRARY_PROPERTIES})
-+  ELSE(ITK_LIBRARY_PROPERTIES)
-+    SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
-+  ENDIF(ITK_LIBRARY_PROPERTIES)
- 
-   ADD_CUSTOM_COMMAND(
-    SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/swigrun.h
---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/CreateWrapperLibrary.cmake
-+++ insighttoolkit-3.20.0/Wrapping/WrapITK/CreateWrapperLibrary.cmake
-@@ -502,7 +502,11 @@
-     SET_TARGET_PROPERTIES(${library_name} PROPERTIES COMPILE_FLAGS -wd191 )
-   ENDIF(CMAKE_CXX_COMPILER MATCHES "icpc")
- 
--  SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
-+  IF(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
-+    SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
-+  ELSE(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
-+    SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
-+  ENDIF(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
-   TARGET_LINK_LIBRARIES(${library_name} 
-     ${WRAPPER_LIBRARY_LINK_LIBRARIES} 
-     ${SWIG_RUNTIME_LANGUAGE}

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2012-01-27 03:04:19 UTC (rev 9442)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2012-01-27 03:37:11 UTC (rev 9443)
@@ -1,32 +1,45 @@
 #!/usr/bin/make -f
 
-VER_MAJOR = 3
-VER_MINOR = 20
-VER_PATCH = 1
+VER_MAJOR = 4
+VER_MINOR = 0
+VER_PATCH = 0
 
+# TODO: turn on the following:
+#
+# system HDF5 (cannot find debug version; transition problem?)
+# system TIFF (requires version 4, currently only in experimental)
+# system VXL (Bug #656837)
+# Module_ITKVideoBridgeOpenCV (undiagnosed build error)
+# Module_ITKVideoBridgeVXL (undiagnosed build error)
+# Module_ITKLevelSetsv4Visualization (https://issues.itk.org/jira/browse/ITK-2856)
+
 CMAKE_FLAGS = \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
-	-DBUILD_TESTING:BOOL=OFF \
-	-DCMAKE_BUILD_TYPE:STRING=Release \
-	-DBUILD_DOXYGEN:BOOL=OFF \
-	-DCMAKE_CXX_FLAGS:STRING=-Wno-deprecated \
+	-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-	-DITK_USE_REVIEW:BOOL=ON \
-	-DITK_USE_REVIEW_STATISTICS:BOOL=ON \
-	-DITK_USE_OPTIMIZED_REGISTRATION_METHODS:BOOL=ON \
-	-DITK_USE_TRANSFORM_IO_FACTORIES:BOOL=ON \
+	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+	-DITKV3_COMPATIBILITY:BOOL=ON \
+	-DITK_USE_MINC2:BOOL=ON \
+	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
+	-DITK_USE_SYSTEM_HDF5:BOOL=OFF \
+	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 	-DITK_USE_SYSTEM_PNG:BOOL=ON \
-	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
+	-DITK_USE_SYSTEM_TIFF:BOOL=OFF \
+	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-	-DITK_USE_SYSTEM_VXL:BOOL=ON \
+	-DModule_ITKIOPhilipsREC:BOOL=ON \
+	-DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
+	-DModule_ITKVideoBridgeOpenCV:BOOL=OFF \
+	-DModule_ITKVideoBridgeVXL:BOOL=OFF \
+	-DModule_ITKVtkGlue:BOOL=OFF \
 	-DUSE_FFTWD:BOOL=ON \
 	-DUSE_FFTWF:BOOL=ON \
-	-DITK_USE_CONCEPT_CHECKING:BOOL=ON \
-	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
-	-DUSE_WRAP_ITK:BOOL=OFF
+	-DUSE_SYSTEM_FFTW:BOOL=ON \
+	-DVCL_INCLUDE_CXX_0X:BOOL=ON \
+	-DBUILD_EXAMPLES:BOOL=OFF \
+	-DBUILD_TESTING:BOOL=OFF
 
 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)
@@ -50,11 +63,6 @@
 	echo "Available disk space:"
 	df -h .
 
-override_dh_auto_install:
-	dh_auto_install
-	sed -i -e "s#/usr/lib/\(`dpkg-architecture -qDEB_HOST_MULTIARCH`/\)\?lib\([^;]*\)\.so#\2#g" \
-		debian/tmp/usr/lib/InsightToolkit/ITKLibraryDepends.cmake
-
 override_dh_lintian:
 	echo "$(pkg_dev): python-script-but-no-python-dep" > debian/$(pkg_dev).lintian-overrides
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
@@ -66,18 +74,18 @@
 
 override_dh_install: 
 	# pkg_lib
-	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
+	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so.* usr/lib
 	cp CMake/InsightValgrind.supp Insight$(SOVERSION)Valgrind.supp
-	cp Utilities/vxl/config/valgrind.supp Insight$(SOVERSION)VxlValgrind.supp
+	cp Modules/ThirdParty/VNL/src/vxl/config/valgrind.supp Insight$(SOVERSION)VxlValgrind.supp
 	dh_install -p$(pkg_lib) Insight$(SOVERSION)*.supp usr/lib/valgrind
 	#
 	# pkg_dev
 	dh_installman -p$(pkg_dev) debian/insighttoolkit.3
 	dh_installdocs -p$(pkg_dev) Documentation/*
-	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so usr/lib
-	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/InsightToolkit/*
-	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake
-	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
+	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib
+	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/ITK-4.0/*
+	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
+#	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
 
 override_dh_installexamples:
 	# pkg_examples




More information about the debian-med-commit mailing list