Author: gert-guest Date: 2015-01-27 11:25:54 +0000 (Tue, 27 Jan 2015) New Revision: 18615
Added: trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch Removed: trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.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/patches/series trunk/packages/insighttoolkit/trunk/debian/rules Log: prepare package for new upstream Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2015-01-27 11:25:54 UTC (rev 18615) @@ -1,3 +1,21 @@ +insighttoolkit4 (4.7.0-1) UNRELEASED; urgency=medium + + [Gert Wollny] + * New upstream version (Closes: #776090) + * d/rules: Add ITK_WRAP_unsigned_long because some filters use it as output + * d/patches: Remove 001_avoid-includsion-of-emmintr_h_without_sse2.patch + fixed upstream + * d/patches: Remove 0002_dont_test_swig_version_before_looking_for_it.patch + fixed upstream + * d/patches: Add patch for correct handling of floating point single + accuracy spacing + * Bump standards version to 3.9.6 + * Change dependency from livvtk5-dev to libvtk6-dev + * Remove dependency from python-vtk, the relevant parts are currently + pulled in by libvtk6-dev + + -- Gert Wollny <gw.foss...@gmail.com> Wed, 21 Jan 2015 13:03:51 +0100 + insighttoolkit4 (4.6.0-3) unstable; urgency=medium * rules: Build Module_ITKDeprecated as Elastix 4.7 needs now-deprecated @@ -15,17 +33,17 @@ insighttoolkit4 (4.6.0-1) unstable; urgency=medium [ Gert Wollny ] - * Remove dependency on libdouble-conversion-dev, since it currently + * Remove dependency on libdouble-conversion-dev, since it currently can not be used (#756480). * Enable use of system hdf5 library. Closes: #756015 * Change gccxml dep to 0.9.0+git20140716 to silence lintian warning. - * Remove patch to increase OtsuThreshold computation precision + * Remove patch to increase OtsuThreshold computation precision (added upstream). - * Remove patch to increase itkVoronoiPartitioningImageFilterTest1 tolerance + * Remove patch to increase itkVoronoiPartitioningImageFilterTest1 tolerance (added upstream). * Revise patch to avoid including emmintr.h when __SSE2__ is not defined. * Add debug package. - * Add patch to not check for the swig_version since it was done before + * Add patch to not check for the swig_version since it was done before find_package(swig). [ Steve M. Robbins ] Modified: trunk/packages/insighttoolkit/trunk/debian/control =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/control 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/control 2015-01-27 11:25:54 UTC (rev 18615) @@ -19,13 +19,12 @@ libminc-dev, libhdf5-dev, python-all-dev, - libvtk5-dev, - python-vtk -Standards-Version: 3.9.5 + libvtk6-dev +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/ -Package: libinsighttoolkit4.6 +Package: libinsighttoolkit4.7 Section: libs Architecture: amd64 i386 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +44,7 @@ Package: libinsighttoolkit4-dev Section: libdevel Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.6 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.7 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev Recommends: libfftw3-dev, uuid-dev Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev Replaces: libinsighttoolkit-dev @@ -68,7 +67,7 @@ Priority: extra Section: debug Architecture: amd64 i386 -Depends: ${misc:Depends}, libinsighttoolkit4.6 (= ${binary:Version}) +Depends: ${misc:Depends}, libinsighttoolkit4.7 (= ${binary:Version}) Description: Debugging information for the Insight Toolkit ITK is an open-source software toolkit for performing registration and segmentation. Segmentation is the process of identifying and Modified: trunk/packages/insighttoolkit/trunk/debian/control.in =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/control.in 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/control.in 2015-01-27 11:25:54 UTC (rev 18615) @@ -19,9 +19,8 @@ libminc-dev, libhdf5-dev, python-all-dev, - libvtk5-dev, - python-vtk -Standards-Version: 3.9.5 + libvtk6-dev +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/ Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch 2015-01-27 11:25:54 UTC (rev 18615) @@ -1,41 +0,0 @@ -Description: on i386 sse2 is not available. Make sure the according header is not - included by gccxml. -Author: Gert Wollny <gw.foss...@gmail.com> -Bug: https://issues.itk.org/jira/browse/ITK-3299 - -diff --git a/Modules/Core/Common/include/itkMathDetail.h b/Modules/Core/Common/include/itkMathDetail.h -index 7db8727..6bd5739 100644 ---- a/Modules/Core/Common/include/itkMathDetail.h -+++ b/Modules/Core/Common/include/itkMathDetail.h -@@ -39,10 +39,6 @@ - #include <fenv.h> // should this be cfenv? - #endif /* ITK_HAVE_FENV_H */ - --#ifdef ITK_HAVE_EMMINTRIN_H --#include <emmintrin.h> // sse 2 intrinsics --#endif /* ITK_HAVE_EMMINTRIN_H */ -- - // assume no SSE2: - #define USE_SSE2_64IMPL 0 - #define USE_SSE2_32IMPL 0 -@@ -104,6 +100,20 @@ - #define VC_USE_ASM_64IMPL 0 - #endif - -+// Now that it has been established that SSE2 is available, -+// include the required header if this is not gccxml. -+// Note that at this point testing for emmintrin.h is superfluos, -+// if it can't be included now the compiler installation is borked. -+// Still, I keep the test because I don't know why it was put there. -+ -+#if (defined(USE_SSE2_32IMPL) || defined(USE_SSE2_64IMPL)) && !defined(__GCCXML__) -+# ifdef ITK_HAVE_EMMINTRIN_H -+# include <emmintrin.h> // sse 2 intrinsics -+# else -+# error "SSE2 is supported but emmintrin.h has not been found" -+# endif /* ITK_HAVE_EMMINTRIN_H */ -+#endif /* USE_SSE2_32IMPL || USE_SSE2_64IMPL */ -+ - namespace itk - { - namespace Math Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch 2015-01-27 11:25:54 UTC (rev 18615) @@ -1,23 +0,0 @@ -Description: cmake tries to read the version of SWIG before it is actually searched for - Since this is just awarning about the used swig version, I simply removed the snipped -Author: Gert Wollny <gw.foss...@gmail.com> -Bug: https://issues.itk.org/jira/browse/ITK-3303 - -diff --git a/Wrapping/Generators/SwigInterface/CMakeLists.txt b/Wrapping/Generators/SwigInterface/CMakeLists.txt -index 6e77848..a8e51ca 100644 ---- a/Wrapping/Generators/SwigInterface/CMakeLists.txt -+++ b/Wrapping/Generators/SwigInterface/CMakeLists.txt -@@ -7,13 +7,6 @@ find_package(PythonInterp REQUIRED) - - option(ITK_USE_SYSTEM_SWIG "Use system swig. If OFF, swig is built as an external project." OFF) - --# Require at least SWIG 3.0.0 --if(ITK_USE_SYSTEM_SWIG) -- if(${SWIG_VERSION} VERSION_LESS 3.0.0) -- message(WARNING "Swig version less than 3.0.0: \"${SWIG_VERSION}\".") -- endif() --endif() -- - set(swig_version 3.0.2) - set(swig_md5 62f9b0d010cef36a13a010dc530d0d41) - set(swigwin_md5 3f18de4fc09ab9abb0d3be37c11fbc8f) Added: trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch (rev 0) +++ trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch 2015-01-27 11:25:54 UTC (rev 18615) @@ -0,0 +1,18 @@ +Description: Correct the type definition for the PointType to that it + is the same like in the parent class. + . +Author: Gert Wollny <gw.foss...@gmail.com> +Bug: https://issues.itk.org/jira/browse/ITK-3342 +Last-Update: 2015-01-21 + +--- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h ++++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h +@@ -86,7 +86,7 @@ + typedef typename InputImageType::PixelType PixelType; + typedef typename InputImageType::RegionType RegionType; + typedef typename InputImageType::IndexType IndexType; +- typedef typename InputImageType::PointType PointType; ++ typedef typename Superclass::PointType PointType; + typedef typename InputImageType::RegionType InputImageRegionType; + + typedef typename InputImageType::SpacingType SpacingType; Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2015-01-27 11:25:54 UTC (rev 18615) @@ -1,5 +1,4 @@ nrrdio-linking.patch bsd-hdf5.patch 0005-make-gdcm-helper-library-static.patch -0001_avoid-includsion-of-emmintr_h_without_sse2.patch -0002_dont_test_swig_version_before_looking_for_it.patch +0003_correct_bsplinecontrolpointimagefunction_pointtype.patch Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2015-01-26 20:46:12 UTC (rev 18614) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2015-01-27 11:25:54 UTC (rev 18615) @@ -1,7 +1,7 @@ #!/usr/bin/make -f VER_MAJOR = 4 -VER_MINOR = 6 +VER_MINOR = 7 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed @@ -63,6 +63,7 @@ -DVCL_INCLUDE_CXX_0X:BOOL=ON \ -DITK_USE_SYSTEM_SWIG:BOOL=ON \ -DITK_WRAP_DIMS="2;3;4" \ + -DITK_WRAP_unsigned_long:BOOL=ON \ -DITK_WRAP_double:BOOL=ON \ -DITK_WRAP_vector_double:BOOL=ON \ -DITK_WRAP_covariant_vector_double:BOOL=ON \ _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit