[med-svn] r9867 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2012-03-04 03:49:05 +0000 (Sun, 04 Mar 2012)
New Revision: 9867

Modified:
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Turn off system TIFF; conflicts with VTK.

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2012-03-04 02:57:20 UTC (rev 9866)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2012-03-04 03:49:05 UTC (rev 9867)
@@ -7,7 +7,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
  libfftw3-dev, libgeotiff-dev,
  uuid-dev, libgdcm2-dev, libminc-dev, libhdf5-dev,
  libvtk5-dev, python-vtk

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2012-03-04 02:57:20 UTC (rev 9866)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2012-03-04 03:49:05 UTC (rev 9867)
@@ -7,7 +7,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
  libfftw3-dev, libgeotiff-dev,
  uuid-dev, libgdcm2-dev, libminc-dev, libhdf5-dev,
  libvtk5-dev, python-vtk

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2012-03-04 02:57:20 UTC (rev 9866)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2012-03-04 03:49:05 UTC (rev 9867)
@@ -7,6 +7,7 @@
 # TODO: turn on the following:
 #
 # system HDF5 (omits C++ bindings; Bug #660547)
+# system TIFF (requires version 4, but libvtk5-dev depends on version 3)
 # system VXL (Bug #656837)
 # Module_ITKLevelSetsv4Visualization (https://issues.itk.org/jira/browse/ITK-2856)
 # Module_ITKVideoBridgeOpenCV (undiagnosed build error)
@@ -26,7 +27,7 @@
 	-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 \
 	-DModule_ITKIOPhilipsREC:BOOL=ON \