Author: malat Date: 2012-05-14 10:04:49 +0000 (Mon, 14 May 2012) New Revision: 10859
Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/openjpegmath.patch Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series trunk/packages/insighttoolkit/branches/3.20.1/debian/rules Log: Prepare next upload Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2012-05-14 10:03:23 UTC (rev 10858) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2012-05-14 10:04:49 UTC (rev 10859) @@ -1,3 +1,11 @@ +insighttoolkit (3.20.1-8) UNRELEASED; urgency=low + + * Fix VolView compilation. Closes: #667411 + * Add hardening flags. Remove some overlinking + * Add math lib for openjpeg. Closes: #672866 + + -- Mathieu Malaterre <[email protected]> Mon, 14 May 2012 11:59:15 +0200 + insighttoolkit (3.20.1-7) unstable; urgency=low * Revert last change back to libtiff-dev Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-14 10:03:23 UTC (rev 10858) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-14 10:04:49 UTC (rev 10859) @@ -1,7 +1,7 @@ Index: insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx =================================================================== ---- insighttoolkit-3.20.1.orig/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2011-10-25 16:37:23.000000000 +0000 -+++ insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-03 20:26:07.942400611 +0000 +--- insighttoolkit-3.20.1.orig/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:13.470123855 +0200 ++++ insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:29.846123261 +0200 @@ -117,13 +117,13 @@ upperBound[partitionDimension] = partitionValue; const unsigned int beginLeftIndex = beginIndex; @@ -20,8 +20,8 @@ Index: insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx =================================================================== ---- insighttoolkit-3.20.1.orig/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2011-10-25 16:37:23.000000000 +0000 -+++ insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-03 20:25:56.758400196 +0000 +--- insighttoolkit-3.20.1.orig/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:13.498123854 +0200 ++++ insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:29.846123261 +0200 @@ -117,13 +117,13 @@ upperBound[partitionDimension] = partitionValue; const unsigned int beginLeftIndex = beginIndex; @@ -38,3 +38,16 @@ lowerBound[partitionDimension] = dimensionLowerBound; +Index: insighttoolkit-3.20.1/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h +=================================================================== +--- insighttoolkit-3.20.1.orig/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h 2012-05-14 11:44:37.334122991 +0200 ++++ insighttoolkit-3.20.1/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h 2012-05-14 11:44:46.594122659 +0200 +@@ -114,7 +114,7 @@ + virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood, + const FloatOffsetType & offset, GlobalDataStruct *gd ) const + { +- return PropagationSpeed( neighborhood, offset, gd ); ++ return this->PropagationSpeed( neighborhood, offset, gd ); + } + + /** Set/Get the sigma for the Gaussian kernel used to compute the gradient Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/openjpegmath.patch =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/openjpegmath.patch (rev 0) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/openjpegmath.patch 2012-05-14 10:04:49 UTC (rev 10859) @@ -0,0 +1,14 @@ +Index: insighttoolkit-3.20.1/Utilities/openjpeg/CMakeLists.txt +=================================================================== +--- insighttoolkit-3.20.1.orig/Utilities/openjpeg/CMakeLists.txt 2011-10-25 16:37:24.000000000 +0000 ++++ insighttoolkit-3.20.1/Utilities/openjpeg/CMakeLists.txt 2012-05-14 09:53:51.402102991 +0000 +@@ -41,6 +41,9 @@ + + # Create the library + ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS}) ++IF(UNIX) ++ TARGET_LINK_LIBRARIES(${OPJ_PREFIX}openjpeg m) ++ENDIF(UNIX) + + # Install library + IF(ITK_LIBRARY_PROPERTIES) Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2012-05-14 10:03:23 UTC (rev 10858) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2012-05-14 10:04:49 UTC (rev 10859) @@ -9,5 +9,6 @@ wrap-iifilter-split.patch itkvtkglue-vtk58.patch gzgetc.patch +png15support.patch ftbfs-gcc-4.7.diff -png15support.patch +openjpegmath.patch Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/rules =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/rules 2012-05-14 10:03:23 UTC (rev 10858) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/rules 2012-05-14 10:04:49 UTC (rev 10859) @@ -1,5 +1,9 @@ #!/usr/bin/make -f +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +DPKG_EXPORT_BUILDFLAGS = 1 +-include /usr/share/dpkg/buildflags.mk + VER_MAJOR = 3 VER_MINOR = 20 VER_PATCH = 1 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
