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

Steven Michael Robbins smr at alioth.debian.org
Sat Sep 17 14:31:33 UTC 2011 

Author: smr
Date: 2011-09-17 14:31:33 +0000 (Sat, 17 Sep 2011)
New Revision: 7846

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Remove language wrappings.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-17 11:58:39 UTC (rev 7845)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-17 14:31:33 UTC (rev 7846)
@@ -1,3 +1,11 @@
+insighttoolkit (3.20.0-16) unstable; urgency=low
+
+  * Remove language wrappings.  New source packages, one per wrapped
+    language will be introduced to build the wrappings.  Build in Release
+    mode for full -O3 optimization.  Build in parallel.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 17 Sep 2011 09:31:10 -0500
+
 insighttoolkit (3.20.0-15) unstable; urgency=low
 
   * control.in: Restore build-dependency on libtiff4-dev (fails to

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2011-09-17 11:58:39 UTC (rev 7845)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2011-09-17 14:31:33 UTC (rev 7846)
@@ -7,9 +7,8 @@
 Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), 
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
- python-dev (>= 2.6.6-3~), python-numpy, libfftw3-dev,
- tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev,
- default-jdk, javahelper (>= 0.18),
+ libfftw3-dev,
+ uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 X-Python-Version: 2.6
 Standards-Version: 3.9.1
@@ -33,79 +32,6 @@
  .
  This package contains the libraries needed to run ITK applications.
 
-Package: libinsighttoolkit3-java
-Section: java
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libinsighttoolkit3-jni
-Description: Image processing toolkit for registration and segmentation - Java 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: libinsighttoolkit3-jni
-Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Image processing toolkit for registration and segmentation - JNI
- 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 Native Interface layer used by the java
- language bindings for ITK.
-
-Package: python-insighttoolkit3
-Section: python
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-insighttoolkit
-Replaces: python-insighttoolkit
-XB-Python-Version: ${python:Versions}
-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 Python language bindings for ITK.
-
-Package: tcl8.5-insighttoolkit3
-Section: interpreters
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, tk8.5
-Conflicts: 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
- 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 Tcl language bindings for ITK.
-
 Package: libinsighttoolkit3-dev
 Section: libdevel
 Architecture: any

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-17 11:58:39 UTC (rev 7845)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-17 14:31:33 UTC (rev 7846)
@@ -7,9 +7,8 @@
 Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), 
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
- python-dev (>= 2.6.6-3~), python-numpy, libfftw3-dev,
- tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev,
- default-jdk, javahelper (>= 0.18),
+ libfftw3-dev,
+ uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 X-Python-Version: 2.6
 Standards-Version: 3.9.1
@@ -33,79 +32,6 @@
  .
  This package contains the libraries needed to run ITK applications.
 
-Package: libinsighttoolkit at VER_MAJOR@-java
-Section: java
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libinsighttoolkit at VER_MAJOR@-jni
-Description: Image processing toolkit for registration and segmentation - Java 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: libinsighttoolkit at VER_MAJOR@-jni
-Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Image processing toolkit for registration and segmentation - JNI
- 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 Native Interface layer used by the java
- language bindings for ITK.
-
-Package: python-insighttoolkit at VER_MAJOR@
-Section: python
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-insighttoolkit
-Replaces: python-insighttoolkit
-XB-Python-Version: ${python:Versions}
-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 Python language bindings for ITK.
-
-Package: tcl8.5-insighttoolkit at VER_MAJOR@
-Section: interpreters
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, tk8.5
-Conflicts: 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
- 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 Tcl language bindings for ITK.
-
 Package: libinsighttoolkit at VER_MAJOR@-dev
 Section: libdevel
 Architecture: any

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-17 11:58:39 UTC (rev 7845)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-17 14:31:33 UTC (rev 7846)
@@ -2,7 +2,7 @@
 
 # If set, honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment
 # out to never build in parallel, regardless of DEB_BUILD_OPTIONS.
-#DEB_BUILD_PARALLEL = true
+DEB_BUILD_PARALLEL = true
 
 # Using install/fast bypasses the install->all dependency,
 # avoiding a complete rebuild by "make install".
@@ -19,9 +19,6 @@
 VER_MINOR = 20
 VER_PATCH = 0
 
-PYVERS = $(shell pyversions -r debian/control)
-TCLVERS = 8.5
-
 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)
 
@@ -31,27 +28,17 @@
 
 pkg_lib = libinsighttoolkit$(SOVERSION)
 pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev
-pkg_java = libinsighttoolkit$(VER_MAJOR)-java
-pkg_jni = libinsighttoolkit$(VER_MAJOR)-jni
-pkg_python = python-insighttoolkit$(VER_MAJOR)
-pkg_tcl = tcl$(TCLVERS)-insighttoolkit$(VER_MAJOR)
 pkg_examples = insighttoolkit$(VER_MAJOR)-examples
 
-JAVA_HOME = /usr/lib/jvm/default-java
-JAVA_JNIDIR = /usr/lib/jni
-
-TCLMODDIR = usr/share/tcltk/tcl$(TCLVERS)/insighttoolkit$(VER_MAJOR)
-
 DEB_CMAKE_EXTRA_FLAGS = \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DBUILD_TESTING:BOOL=OFF \
-	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DCMAKE_BUILD_TYPE:STRING=Release \
 	-DBUILD_DOXYGEN:BOOL=OFF \
 	-DCMAKE_CXX_FLAGS:STRING=-Wno-deprecated \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-	-DITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND \
 	-DITK_USE_REVIEW:BOOL=ON \
 	-DITK_USE_REVIEW_STATISTICS:BOOL=ON \
 	-DITK_USE_OPTIMIZED_REGISTRATION_METHODS:BOOL=ON \
@@ -65,29 +52,7 @@
 	-DUSE_FFTWF:BOOL=ON \
 	-DITK_USE_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
-	-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/$(PYVERS) \
-	-DPYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) \
-	-DPYTHON_NUMPY_INCLUDE_PATH:PATH=/usr/include/$(PYVERS)/numpy \
-	-DPYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so \
-	-DTCL_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \
-	-DTCL_LIBRARY:FILEPATH=/usr/lib/libtcl$(TCLVERS).so \
-	-DTCL_TCLSH:FILEPATH=/usr/bin/tclsh$(TCLVERS) \
-	-DTK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \
-	-DTK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so \
-	-DUSE_WRAP_ITK:BOOL=ON \
-	-DWRAP_ITK_JAVA:BOOL=ON \
-	-DWRAP_ITK_PYTHON:BOOL=ON \
-	-DWRAP_ITK_TCL:BOOL=ON \
-	-DWRAP_ITK_DIMS:STRING='2;3' \
-	-DWRAP_complex_float:BOOL=ON \
-	-DWRAP_covariant_vector_float:BOOL=ON \
-	-DWRAP_float:BOOL=ON \
-	-DWRAP_rgb_unsigned_char:BOOL=ON \
-	-DWRAP_rgb_unsigned_short:BOOL=ON \
-	-DWRAP_signed_short:BOOL=ON \
-	-DWRAP_unsigned_char:BOOL=ON \
-	-DWRAP_unsigned_short:BOOL=ON \
-	-DWRAP_vector_float:BOOL=ON
+	-DUSE_WRAP_ITK:BOOL=OFF
 
 pre-build::
 	echo "Available disk space:"
@@ -99,17 +64,11 @@
 		$(DEB_BUILDDIR)/ITKLibraryDepends.cmake
 
 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
-	echo "$(pkg_python): non-dev-pkg-with-shlib-symlink" > debian/$(pkg_python).lintian-overrides
-	echo "$(pkg_python): package-name-doesnt-match-sonames" >> debian/$(pkg_python).lintian-overrides
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg8.so.3.20.0: libjpeg" >> debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg12.so.3.20.0: libjpeg" >> debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg16.so.3.20.0: libjpeg" >> debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkopenjpeg.so.3.20.0: openjpeg" >> debian/$(pkg_lib).lintian-overrides
-	echo "$(pkg_jni): postinst-has-useless-call-to-ldconfig" >> debian/$(pkg_jni).lintian-overrides
-	echo "$(pkg_jni): postrm-has-useless-call-to-ldconfig" >> debian/$(pkg_jni).lintian-overrides
 	dh_lintian
 
 install/$(pkg_lib)::
@@ -123,29 +82,9 @@
 	dh_installdocs -p$(pkg_dev) Documentation/*
 	dh_install -p$(pkg_dev) -XJava -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 
+	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake
+	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
 
-install/$(pkg_java)::
-	jh_installlibs -p$(pkg_java) debian/tmp/usr/lib/InsightToolkit/WrapITK/Java/*.jar
-
-install/$(pkg_jni)::
-	dh_install -p$(pkg_jni) -XlibSwig debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*Java.so* $(JAVA_JNIDIR)
-	dh_install -p$(pkg_jni)           debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/libSwigRuntimeJava.so* usr/lib
-
-install/$(pkg_python)::
-	dh_install -p$(pkg_python) -XlibSwig --autodest usr/lib/InsightToolkit/WrapITK/lib/*Python.so*
-	dh_install -p$(pkg_python)           usr/lib/InsightToolkit/WrapITK/lib/libSwigRuntimePython.so* usr/lib
-	dh_install -p$(pkg_python)           --autodest usr/lib/python*/dist-packages
-	dh_install -p$(pkg_python)           --autodest usr/lib/InsightToolkit/WrapITK/Python
-	dh_install -p$(pkg_python)           --autodest usr/lib/InsightToolkit/WrapITK/lib/*.py
-	dh_python2 -p$(pkg_python)
-
-install/$(pkg_tcl)::
-	dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/bin/itkwish usr/bin
-	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_examples)::
 	dh_installexamples -p$(pkg_examples) Examples/*
 	find debian/$(pkg_examples)/usr/share/doc/$(pkg_examples)/examples \

More information about the debian-med-commit mailing list