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

[Steven Michael Robbins]

Author: smr
Date: 2010-10-19 13:58:14 +0000 (Tue, 19 Oct 2010)
New Revision: 5368

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/review-statistics.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/unset-vtk-version.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/TODO
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add Review/Statistics.

Modified: trunk/packages/insighttoolkit/trunk/debian/TODO
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/TODO	2010-10-18 05:52:41 UTC (rev 5367)
+++ trunk/packages/insighttoolkit/trunk/debian/TODO	2010-10-19 13:58:14 UTC (rev 5368)
@@ -2,6 +2,13 @@
 TODO List for ITK Debian Package
 --------------------------------
 
+
+Un-versioned file in shared lib package:
+  dpkg: error processing libinsighttoolkit3.20_3.20.0-3_amd64.deb (--install):
+   trying to overwrite '/usr/lib/valgrind/InsightVxlValgrind.supp', which is also in package libinsighttoolkit3.18 3.18.0-4
+
+
+
 To Do:
 
 - eradicate build directory from output; e.g.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-10-18 05:52:41 UTC (rev 5367)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-10-19 13:58:14 UTC (rev 5368)
@@ -1,3 +1,10 @@
+insighttoolkit (3.20.0-3) experimental; urgency=low
+
+  * Add Review/Statistics.  Use a separate tarball because the .orig.tar
+    has all of Code/Review removed.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 18 Oct 2010 22:36:54 -0500
+
 insighttoolkit (3.20.0-2) experimental; urgency=low
 
   * Switch to source package 3.0 (quilt) format.

Added: trunk/packages/insighttoolkit/trunk/debian/patches/review-statistics.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/review-statistics.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/review-statistics.patch	2010-10-19 13:58:14 UTC (rev 5368)
@@ -0,0 +1,37 @@
+--- /dev/null
++++ insighttoolkit-3.20.0/Code/Review/CMakeLists.txt
+@@ -0,0 +1,3 @@
++IF (ITK_USE_REVIEW_STATISTICS)
++   SUBDIRS( ../../review-statistics )
++ENDIF (ITK_USE_REVIEW_STATISTICS)
+--- insighttoolkit-3.20.0.orig/Code/BasicFilters/itkConnectedThresholdImageFilter.txx
++++ insighttoolkit-3.20.0/Code/BasicFilters/itkConnectedThresholdImageFilter.txx
+@@ -22,7 +22,7 @@
+ #include "itkFloodFilledImageFunctionConditionalIterator.h"
+ #include "itkProgressReporter.h"
+ 
+-#ifdef ITK_USE_REVIEW
++#ifdef ITK_USE_REVIEW_NOT
+ #include "itkShapedFloodFilledImageFunctionConditionalIterator.h"
+ #endif
+ 
+@@ -305,7 +305,7 @@
+       }
+     }
+   
+-#ifdef ITK_USE_REVIEW
++#ifdef ITK_USE_REVIEW_NOT
+   else if (this->m_Connectivity == FullConnectivity)
+     {
+     // use the fully connected iterator here. The fully connected iterator 
+--- insighttoolkit-3.20.0.orig/Code/BasicFilters/itkConnectedThresholdImageFilter.h
++++ insighttoolkit-3.20.0/Code/BasicFilters/itkConnectedThresholdImageFilter.h
+@@ -126,7 +126,7 @@
+    *  Default is to use FaceConnectivity. */
+   typedef enum { FaceConnectivity, FullConnectivity } ConnectivityEnumType;
+ 
+-#ifdef ITK_USE_REVIEW
++#ifdef ITK_USE_REVIEW_NOT
+   /** Type of connectivity to use (fully connected OR 4(2D), 6(3D), 
+    * 2*N(ND) connectivity) */
+   itkSetEnumMacro( Connectivity, ConnectivityEnumType );

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-10-18 05:52:41 UTC (rev 5367)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-10-19 13:58:14 UTC (rev 5368)
@@ -1,3 +1,4 @@
+unset-vtk-version.patch
 hppa-complex-long-double.patch
 03_examples.patch
 tcl-install.patch
@@ -3,2 +4,3 @@
 jni-dir.patch
 remove-cmake-export-build-settings.patch
+review-statistics.patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/unset-vtk-version.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/unset-vtk-version.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/unset-vtk-version.patch	2010-10-19 13:58:14 UTC (rev 5368)
@@ -0,0 +1,10 @@
+--- insighttoolkit-3.20.0.orig/CMakeLists.txt
++++ insighttoolkit-3.20.0/CMakeLists.txt
+@@ -811,6 +811,7 @@
+   FIND_PACKAGE(GDCM)
+   IF(GDCM_FOUND)
+     INCLUDE(${GDCM_USE_FILE})
++    UNSET(VTK_VERSION)
+     IF( "${GDCM_MAJOR_VERSION}" LESS 2.0 )
+       SET(ITK_GDCM_LIBRARIES gdcm)
+     ELSE( "${GDCM_MAJOR_VERSION}" LESS 2.0 )

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2010-10-18 05:52:41 UTC (rev 5367)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2010-10-19 13:58:14 UTC (rev 5368)
@@ -62,6 +62,8 @@
 	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
 	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
+	-DITK_USE_REVIEW:BOOL=ON \
+	-DITK_USE_REVIEW_STATISTICS:BOOL=ON \
 	-DUSE_FFTWD:BOOL=ON \
 	-DUSE_FFTWF:BOOL=ON \
 	-DITK_USE_CONCEPT_CHECKING:BOOL=ON \
@@ -75,6 +77,9 @@
 	-DTK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \
 	-DTK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so
 
+makebuilddir::
+	ln -s ../../review-statistics Code/Review/Statistics
+
 common-build-arch::
 	echo "$(pkg_tcl): non-dev-pkg-with-shlib-symlink" > debian/$(pkg_tcl).lintian-overrides
 	echo "$(pkg_tcl): package-name-doesnt-match-sonames" >> debian/$(pkg_tcl).lintian-overrides