[med-svn] r16374 - in trunk/packages/insighttoolkit/branches/itk4-enable-python/debian: . patches

Gert Wollny gert-guest at moszumanska.debian.org
Tue Mar 4 13:22:33 UTC 2014 

Author: gert-guest
Date: 2014-03-04 13:22:32 +0000 (Tue, 04 Mar 2014)
New Revision: 16374

Modified:
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/bsd-hdf5.patch
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
Log:
add initial python support

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-04 13:22:32 UTC (rev 16374)
@@ -1,3 +1,11 @@
+insighttoolkit4 (4.5.1-1) UNRELEASED; urgency=medium
+
+  [Gert Wollny]
+  * new uptream
+  * enable python2.7 bindings
+
+ -- Gert Wollny <wollny at die.upm.es>  Mon, 24 Feb 2014 11:39:21 +0100
+
 insighttoolkit4 (4.5.0-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control	2014-03-04 13:22:32 UTC (rev 16374)
@@ -5,10 +5,10 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
 Build-Depends: debhelper (>= 9),
- cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
+ cmake, swig (>= 2.0), gccxml (>= 0.9.0+cvs20120309),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff-dev,
  libdcmtk2-dev, libgdcm2-dev, libdouble-conversion-dev,
- uuid-dev, libminc-dev, libhdf5-dev,
+ uuid-dev, libminc-dev, libhdf5-dev
  libvtk5-dev, python-vtk
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
@@ -72,3 +72,23 @@
  combine the information contained in both.
  .
  This package contains the source for example programs.
+
+
+Package: insighttoolkit4-python
+Section: python
+Architecture: amd64 i386
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: insighttoolkit-python
+Replaces: insighttoolkit-python
+Description: Image processing toolkit for registration and segmentation - examples
+ ITK is an open-source software toolkit for performing registration and
+ segmentation. Segmentation is the process of identifying and
+ classifying data found in a digitally sampled
+ representation. Typically the sampled representation is an image
+ acquired from such medical instrumentation as CT or MRI
+ scanners. Registration is the task of aligning or developing
+ correspondences between data. For example, in the medical
+ environment, a CT scan may be aligned with a MRI scan in order to
+ combine the information contained in both.
+ .
+ This package contains the source for example programs.

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-04 13:22:32 UTC (rev 16374)
@@ -72,3 +72,20 @@
  combine the information contained in both.
  .
  This package contains the source for example programs.
+
+Package: insighttoolkit at VER_MAJOR@-python 
+Section: python 
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Image processing toolkit for registration and segmentation - examples
+ ITK is an open-source software toolkit for performing registration and
+ segmentation. Segmentation is the process of identifying and
+ classifying data found in a digitally sampled
+ representation. Typically the sampled representation is an image
+ acquired from such medical instrumentation as CT or MRI
+ scanners. Registration is the task of aligning or developing
+ correspondences between data. For example, in the medical
+ environment, a CT scan may be aligned with a MRI scan in order to
+ combine the information contained in both.
+ .
+ This package contains the python bindings. 

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/bsd-hdf5.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/bsd-hdf5.patch	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/bsd-hdf5.patch	2014-03-04 13:22:32 UTC (rev 16374)
@@ -10,7 +10,7 @@
  #-----------------------------------------------------------------------------
  IF (CMAKE_COMPILER_IS_GNUCC)
    SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -finline-functions -fno-common")
-+  IF ($ENV{DEB_HOST_ARCH_OS} STREQUAL "kfreebsd")
++  IF ("x$ENV{DEB_HOST_ARCH_OS}" STREQUAL "xkfreebsd")
 +    SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE")
 +  ENDIF ()
  ENDIF (CMAKE_COMPILER_IS_GNUCC)

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/patches/series	2014-03-04 13:22:32 UTC (rev 16374)
@@ -1,3 +1,7 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
 #doubleconv.patch
+0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch
+0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch
+0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch
+0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-04 13:08:42 UTC (rev 16373)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-04 13:22:32 UTC (rev 16374)
@@ -3,6 +3,8 @@
 VER_MAJOR = 4
 VER_MINOR = 5
 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 # TODO: turn on the following:
 #
 # system HDF5 (omits C++ bindings; Bug #660547)
@@ -13,6 +15,9 @@
 # Module_ITKVideoBridgeVXL (undiagnosed build error)
 # Module_ITKVtkGlue (https://issues.itk.org/jira/browse/ITK-2856)
 
+# multi-python, no idea how to do this without re-compiling all and everything for 
+#     each python version    
+
 CMAKE_FLAGS = \
 	-DBUILD_EXAMPLES:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -21,11 +26,12 @@
 	-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-	-DITK_USE_FFTWD:BOOL=OFF \
-	-DITK_USE_FFTWF:BOOL=OFF \
+        -DUSE_FFTWF=ON \
+	-DITK_USE_FFTWD:BOOL=ON \
+	-DITK_USE_FFTWF:BOOL=ON \
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
-	-DITK_USE_SYSTEM_FFTW:BOOL=OFF \
+	-DITK_USE_SYSTEM_FFTW:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
 	-DITK_USE_SYSTEM_HDF5:BOOL=OFF \
@@ -34,6 +40,7 @@
 	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
+	-DITK_USE_SYSTEM_GCCXML:BOOL=ON \
 	-DModule_ITKDCMTK:BOOL=ON \
 	-DModule_ITKIOPhilipsREC:BOOL=OFF \
 	-DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
@@ -41,13 +48,24 @@
 	-DModule_ITKVideoBridgeOpenCV:BOOL=OFF \
 	-DModule_ITKVideoBridgeVXL:BOOL=OFF \
 	-DModule_ITKVtkGlue:BOOL=OFF \
-	-DVCL_INCLUDE_CXX_0X:BOOL=ON
+	-DVCL_INCLUDE_CXX_0X:BOOL=ON \
+        -DITK_USE_SYSTEM_SWIG:BOOL=ON \
+        -DITK_WRAP_DIMS="2;3;4" \
+	-DITK_WRAP_double:BOOL=ON \
+        -DITK_WRAP_vector_double:BOOL=ON \
+        -DITK_WRAP_covariant_vector_double:BOOL=ON \
+        -DITK_WRAP_complex_double:BOOL=ON \
+        -DITK_WRAPPING:BOOL=ON \
+        -DITK_WRAP_PYTHON:BOOL=ON \
+	-DPython_ADDITIONAL_VERSIONS=2.7 
 
+
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)
 
 pkg_lib = libinsighttoolkit$(SOVERSION)
 pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev
 pkg_examples = insighttoolkit$(VER_MAJOR)-examples
+pkg_python = insighttoolkit$(VER_MAJOR)-python
 
 
 %:
@@ -82,6 +100,10 @@
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver
 #	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
+        #
+        # pkg_python 
+	dh_install -p$(pkg_python) debian/tmp/usr/lib/python2.7/* usr/lib/python2.7/
+	dh_install -p$(pkg_python) usr/lib/ITK-$(SOVERSION)/Python usr/lib/ITK-$(SOVERSION)
 
 override_dh_installexamples:
 	# pkg_examples

More information about the debian-med-commit mailing list