Index: debian/control =================================================================== --- debian/control (revision 4241) +++ debian/control (working copy) @@ -8,9 +8,7 @@ cmake, cableswig (>= 0.1.0+cvs20090916), gccxml (>= 0.9.0+cvs20090916), zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3), python-support (>= 0.6.4), python-dev, libfftw3-dev, - tcl8.4-dev, tk8.4-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev, - libfreetype6-dev, libopenjpeg-dev, graphviz, - libxext-dev, libxss-dev, libxft-dev, libpoppler-dev, libssl-dev + tcl8.5-dev, tk8.5-dev, libgdcm2-dev, libvxl1-dev XS-Python-Version: current Standards-Version: 3.8.3 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0 @@ -33,6 +31,23 @@ . This package contains the libraries needed to run ITK applications. +Package: insighttoolkit3-java +Section: java +Architecture: any +Depends: ${java:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Image processing toolkit for registration and segmentation - Python bindings + 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 Java language bindings for ITK. + Package: python-insighttoolkit3 Section: python Architecture: any @@ -53,10 +68,12 @@ . This package contains the Python language bindings for ITK. -Package: tcl8.4-insighttoolkit3 +Package: tcl8.5-insighttoolkit3 Section: interpreters Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.4, tk8.4 +Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, tk8.5 +Conflicts: tcl8.4-insighttoolkit3 +Replaces: tcl8.4-insighttoolkit3 Description: Image processing toolkit for registration and segmentation - Tcl bindings ITK is an open-source software toolkit for performing registration and segmentation. Segmentation is the process of identifying and Index: debian/patches/series =================================================================== --- debian/patches/series (revision 4241) +++ debian/patches/series (working copy) @@ -2,3 +2,4 @@ 03_examples.patch tcl-install.patch use_system_vxl.patch +#wrapitk_noreview.patch Index: debian/patches/wrapitk_noreview.patch =================================================================== --- debian/patches/wrapitk_noreview.patch (revision 0) +++ debian/patches/wrapitk_noreview.patch (revision 0) @@ -0,0 +1,25 @@ +--- insighttoolkit-3.4.0.orig/Wrapping/WrapITK/CMakeLists.txt 2009-11-09 14:28:31.000000000 +0100 ++++ insighttoolkit-3.4.0/Wrapping/WrapITK/CMakeLists.txt.old 2009-11-09 14:28:13.000000000 +0100 +@@ -145,8 +145,8 @@ + Denoising + DistanceMap + EdgesAndContours +- FFT +- FFTW ++ #FFT ++ #FFTW + Filtering + IntensityFilters + Interpolators +@@ -156,9 +156,9 @@ + Morphology + #Patented + PixelMath +- Registration ++ #Registration + Resize +- Review ++ #Review + SegmentationAndThreshold + SegmentationValidation + SimpleFilters Property changes on: debian/patches/wrapitk_noreview.patch ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Index: debian/rules =================================================================== --- debian/rules (revision 4241) +++ debian/rules (working copy) @@ -18,14 +18,15 @@ pkg_lib = libinsighttoolkit$(SOVERSION) pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev pkg_python = python-insighttoolkit$(VER_MAJOR) -pkg_tcl = tcl8.4-insighttoolkit$(VER_MAJOR) +pkg_tcl = tcl8.5-insighttoolkit$(VER_MAJOR) +pkg_java = insighttoolkit$(VER_MAJOR)-java pkg_examples = insighttoolkit$(VER_MAJOR)-examples PYVERS = $(shell pyversions -r debian/control) PYMODDIR = usr/lib/$(PYVERS)/site-packages PYEXTDIR = $(PYMODDIR) -TCLVERS = 8.4 +TCLVERS = 8.5 TCLMODDIR = usr/share/tcltk/tcl$(TCLVERS)/insighttoolkit$(VER_MAJOR) DEB_BUILDDIR = $(CURDIR)/Build @@ -76,21 +77,30 @@ dh_install -p$(pkg_dev) -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so usr/lib dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/InsightToolkit/* dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake + # FIXME + dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/WrapITK/ClassIndex/* + dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/WrapITK/Configuration/* + dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/WrapITK/SWIG/* install/$(pkg_python):: - dh_install -p$(pkg_python) -XlibSwig debian/tmp/usr/lib/InsightToolkit/*Python.so* $(PYEXTDIR) - dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/libSwigRuntimePython.so* usr/lib - dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/python/* $(PYMODDIR) - dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/*.py $(PYMODDIR) + dh_install -p$(pkg_python) -XlibSwig debian/tmp/usr/lib/InsightToolkit/WrapITK/*Python.so* $(PYEXTDIR) + dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/WrapITK/libSwigRuntimePython.so* usr/lib + dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/WrapITK/Python/* $(PYMODDIR) + dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*.py $(PYMODDIR) dh_pysupport -p$(pkg_python) install/$(pkg_tcl):: - mv debian/tmp/usr/lib/InsightToolkit/itkwish-* debian/tmp/usr/bin/itkwish + mv debian/tmp/usr/lib/InsightToolkit/WrapITK/bin/itkwish* debian/tmp/usr/bin/itkwish dh_install -p$(pkg_tcl) --autodest debian/tmp/usr/bin/itkwish - dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/*Tcl.so* usr/lib - dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/tcl/* $(TCLMODDIR) + dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*Tcl.so* usr/lib + dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/Tcl/* $(TCLMODDIR) dh_installman -p$(pkg_tcl) debian/itkwish.1 +install/$(pkg_java):: + dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*Java.so* usr/lib/jni + # TODO: I think we need a symlink to version'ed jar file: + dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/Java/* usr/share/java + install/$(pkg_examples):: dh_installexamples -p$(pkg_examples) Examples/* find debian/$(pkg_examples)/usr/share/doc/$(pkg_examples)/examples \ @@ -102,7 +112,8 @@ get-orig-source: $(UPSTREAM_SRC).tar.gz tar xzf $(UPSTREAM_SRC).tar.gz find $(UPSTREAM_SRC) -name CVS -o -name Patented | xargs rm -rf - rm -rf $(UPSTREAM_SRC)/Code/Review + #rm -rf $(UPSTREAM_SRC)/Code/Review + #find $(UPSTREAM_SRC)/Code/Review -type f | grep -v itkComposeRGBAImageFilter | grep -v itkFlatStructuringElement | grep -v itkKernelImageFilter | grep -v itkSharedMorphologyUtilities | grep -v itkBoxImageFilter | grep -v itkVanHerkGilWermanDilateImageFilter | grep -v itkVanHerkGilWermanErodeDilateImageFilter | grep -v itkBresenhamLine | grep -v itkVanHerkGilWermanUtilities | xargs rm -rf mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR) GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR) Index: debian/CMakeCache.txt.debian =================================================================== --- debian/CMakeCache.txt.debian (revision 4241) +++ debian/CMakeCache.txt.debian (working copy) @@ -6,6 +6,7 @@ CMAKE_VERBOSE_MAKEFILE:BOOL=ON // Conform to VTK's setting +// this is not required anymore with cmake 2.8 CMAKE_CXX_COMPILER:STRING=/usr/bin/c++ // Don't build examples now (let the user later) @@ -37,11 +38,14 @@ ITK_CSWIG_JAVA:BOOL=OFF //Build cswig Python wrapper support (requires CableSwig). -ITK_CSWIG_PYTHON:BOOL=ON +ITK_CSWIG_PYTHON:BOOL=OFF //Build cswig Tcl wrapper support (requires CableSwig). -ITK_CSWIG_TCL:BOOL=ON +ITK_CSWIG_TCL:BOOL=OFF +USE_WRAP_ITK:BOOL=ON +ITK_USE_REVIEW:BOOL=ON + // We haven't packaged this (yet) ITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND @@ -51,7 +55,7 @@ ITK_USE_SYSTEM_PNG:BOOL=ON ITK_USE_SYSTEM_TIFF:BOOL=ON ITK_USE_SYSTEM_ZLIB:BOOL=ON -ITK_USE_SYSTEM_VXL:BOOL=OFF +ITK_USE_SYSTEM_VXL:BOOL=ON // Optional libraries USE_FFTWD:BOOL=ON