[med-svn] r5391 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Oct 30 22:09:45 UTC 2010
Author: smr
Date: 2010-10-30 22:09:15 +0000 (Sat, 30 Oct 2010)
New Revision: 5391
Added:
trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.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:
Switch to source v3.0 format. Fix a build error and an upgrade file conflict.
Modified: trunk/packages/insighttoolkit/trunk/debian/TODO
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/TODO 2010-10-30 21:54:59 UTC (rev 5390)
+++ trunk/packages/insighttoolkit/trunk/debian/TODO 2010-10-30 22:09:15 UTC (rev 5391)
@@ -1,16 +1,18 @@
-
TODO List for ITK Debian Package
--------------------------------
+- Build using Review and Review/Statistics, to enable building elastix.
+ Add following to rules:
-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
+DEB_CMAKE_EXTRA_FLAGS = \
+ ...
+ -DITK_USE_REVIEW:BOOL=ON \
+ -DITK_USE_REVIEW_STATISTICS:BOOL=ON \
+makebuilddir::
+ ln -s ../../review-statistics Code/Review/Statistics
-To Do:
-
- eradicate build directory from output; e.g.
grep -r /usr/local/src/Packages/insighttoolkit/alioth/build-area/ /usr/include/InsightToolkit/
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-10-30 21:54:59 UTC (rev 5390)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-10-30 22:09:15 UTC (rev 5391)
@@ -1,20 +1,16 @@
-insighttoolkit (3.20.0-3) experimental; urgency=low
+insighttoolkit (3.20.0-2) experimental; urgency=low
+ * Switch to source package 3.0 (quilt) format.
+
* rules: Embed SOVERSION in valgrind suppression files to avoid file
conflicts on upgrade to new versions of insighttoolkit. Closes:
#600867. Merge from branches/3.18.0
+
+ * patches/metaio-test-vtk_source.patch: New. Upstream fix for build
+ error (thanks, Mathieu Malaterre). Closes: #600677.
- * Add Review/Statistics. Use a separate tarball because the .orig.tar
- has all of Code/Review removed.
+ -- Steve M. Robbins <smr at debian.org> Sat, 30 Oct 2010 16:55:30 -0500
- -- 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.
-
- -- Steve M. Robbins <smr at debian.org> Sun, 17 Oct 2010 22:47:36 -0500
-
insighttoolkit (3.20.0-1) experimental; urgency=low
* New upstream.
Added: trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch 2010-10-30 22:09:15 UTC (rev 5391)
@@ -0,0 +1,45 @@
+Description: Use VTK_SOURCE_DIR to determine if MetaIO is built inside of VTK or ITK
+Author: Stephen Aylward
+Bug: 600677
+
+Patch obtained from upstream git:
+ http://itk.org/gitweb?p=ITK.git;a=patch;h=93833edb2294c0190af9e6c0de26e9485399a7d3
+
+From 93833edb2294c0190af9e6c0de26e9485399a7d3 Mon Sep 17 00:00:00 2001
+From: ITK Robot <itkrobot at kitware.com>
+Date: Thu, 22 Jul 2010 10:54:04 -0400
+Subject: [PATCH] r2796 aylward | 2010-07-22T14:53:45.146190Z
+ BUG: Changed from VTK_VERSION to VTK_SOURCE_DIR to determine if being compiled within VTK or ITK.
+
+---
+ Utilities/MetaIO/CMakeLists.txt | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+--- insighttoolkit-3.20.0.orig/Utilities/MetaIO/CMakeLists.txt
++++ insighttoolkit-3.20.0/Utilities/MetaIO/CMakeLists.txt
+@@ -9,11 +9,14 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
+-IF(VTK_VERSION)
++IF(VTK_SOURCE_DIR)
++
+ SET(METAIO_FOR_VTK 1)
+ MARK_AS_ADVANCED( METAIO_FOR_VTK )
+ SET(METAIO_NAMESPACE "vtkmetaio")
+-ELSE(VTK_VERSION)
++
++ELSE(VTK_SOURCE_DIR)
++
+ SET(METAIO_FOR_ITK 1)
+ MARK_AS_ADVANCED( METAIO_FOR_ITK )
+ SET(METAIO_NAMESPACE "ITKMetaIO")
+@@ -23,7 +26,7 @@
+ INCLUDE_DIRECTORIES(${ITK_LIBXML2_INCLUDE_DIR})
+ ENDIF(ITK_USE_LIBXML2)
+
+-ENDIF(VTK_VERSION)
++ENDIF(VTK_SOURCE_DIR)
+
+ PROJECT( ${METAIO_NAMESPACE} )
+
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-10-30 21:54:59 UTC (rev 5390)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-10-30 22:09:15 UTC (rev 5391)
@@ -1,7 +1,6 @@
-unset-vtk-version.patch
+metaio-test-vtk_source.patch
hppa-complex-long-double.patch
03_examples.patch
tcl-install.patch
jni-dir.patch
remove-cmake-export-build-settings.patch
-review-statistics.patch
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2010-10-30 21:54:59 UTC (rev 5390)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2010-10-30 22:09:15 UTC (rev 5391)
@@ -62,8 +62,6 @@
-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 \
@@ -77,9 +75,6 @@
-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
More information about the debian-med-commit
mailing list