[med-svn] r1850 - in trunk/packages/insighttoolkit/trunk/debian: . patches

smr at alioth.debian.org smr at alioth.debian.org
Mon May 12 03:01:16 UTC 2008 

Author: smr
Date: 2008-05-12 03:01:14 +0000 (Mon, 12 May 2008)
New Revision: 1850

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add new package tcl8.4-insighttoolkit3.

Modified: trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian	2008-05-12 02:58:49 UTC (rev 1849)
+++ trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian	2008-05-12 03:01:14 UTC (rev 1850)
@@ -2,6 +2,9 @@
 # This is the Kickstart CMakeCache file for the Debian build of ITK.
 # Only those settings that are changed from the default are specified.
 
+// Make the build verbose, to ease debugging of buildd logs
+CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+
 // Conform to VTK's setting
 CMAKE_CXX_COMPILER:STRING=/usr/bin/c++
 
@@ -36,7 +39,7 @@
 ITK_CSWIG_PYTHON:BOOL=ON
 
 //Build cswig Tcl wrapper support (requires CableSwig).
-ITK_CSWIG_TCL:BOOL=OFF
+ITK_CSWIG_TCL:BOOL=ON
 
 // We haven't packaged this (yet)
 ITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-12 02:58:49 UTC (rev 1849)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-12 03:01:14 UTC (rev 1850)
@@ -4,9 +4,17 @@
   
   * debian/control:
   * debian/rules: Add major version ('3') to all package names,
-    in order to support two major versions in the Debian archive.
+    in order to support two major versions in the Debian archive.  
+  
+  * debian/control:
+  * debian/rules:
+  * debian/CMakeCache.txt.debian: New package tcl8.4-insighttoolkit3 for
+    Tcl bindings.
+  * debian/patches/tcl-install.patch: New.  Patch pkgIndex.tcl to search
+    for extension modules (shared libs) in /usr/lib.
+  * debian/patches/series: Add above.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 10 May 2008 08:58:30 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sun, 11 May 2008 22:00:48 -0500
 
 insighttoolkit (3.4.0-4) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2008-05-12 02:58:49 UTC (rev 1849)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2008-05-12 03:01:14 UTC (rev 1850)
@@ -4,7 +4,7 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Gavin Baker <gavinb at antonym.org>, Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 5), cmake, cableswig, zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3), python-support (>= 0.6.4), python-dev, python-numarray, libfftw3-dev
+Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 5), cmake, cableswig, zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3), python-support (>= 0.6.4), python-dev, python-numarray, libfftw3-dev, tcl8.4-dev, tk8.4-dev
 XS-Python-Version: current
 Standards-Version: 3.7.3
 
@@ -47,6 +47,24 @@
  .
  This package contains the Python language bindings for ITK.
 
+Package: tcl8.4-insighttoolkit3
+Section: interpreters
+Architecture: any
+Depends: ${shlibs:Depends}, tcl8.4, tk8.4
+Suggests: insighttoolkit-examples
+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: devel
 Architecture: any

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-12 02:58:49 UTC (rev 1849)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-12 03:01:14 UTC (rev 1850)
@@ -1,3 +1,4 @@
 03_examples.patch
 gcc43.patch
 
+tcl-install.patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/tcl-install.patch	2008-05-12 03:01:14 UTC (rev 1850)
@@ -0,0 +1,15 @@
+This patch lets us install all the shared libs for Tcl
+into /usr/lib.  However, maybe we could hide them somewhere
+else; e.g. /usr/lib/tcltk/???
+
+--- insighttoolkit-3.6.0.orig/Wrapping/CSwig/CMakeLists.txt
++++ insighttoolkit-3.6.0/Wrapping/CSwig/CMakeLists.txt
+@@ -347,7 +347,7 @@
+ # Configure pkgIndex.tcl for the install tree.
+ 
+ SET(ITK_CSWIG_SCRIPT_DIR "[file dirname [info script]]")
+-SET(ITK_CSWIG_PACKAGE_DIR "[file dirname [file dirname [info script]]]")
++SET(ITK_CSWIG_PACKAGE_DIR "/usr/lib")
+ SET(ITK_CSWIG_DATA_ROOT "[file dirname [file dirname [info script]]]/Data")
+ SET(ITK_CSWIG_TEST_ROOT "<NO_DEFAULT>")
+ CONFIGURE_FILE("${ITK_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2008-05-12 02:58:49 UTC (rev 1849)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2008-05-12 03:01:14 UTC (rev 1850)
@@ -7,12 +7,16 @@
 pkg_lib = libinsighttoolkit3.6
 pkg_dev = libinsighttoolkit3-dev
 pkg_python = python-insighttoolkit3
+pkg_tcl = tcl8.4-insighttoolkit3
 pkg_examples = insighttoolkit3-examples
 
 PYVERS = $(shell pyversions -r debian/control)
 PYMODDIR = usr/share/python-support/$(pkg_python)
 PYEXTDIR = usr/lib/python-support/$(pkg_python)/$(PYVERS)
 
+TCLVERS = 8.4
+TCLMODDIR = usr/share/tcltk/tcl8.4/insighttoolkit3
+
 DEB_BUILDDIR = $(CURDIR)/Build
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
@@ -26,17 +30,22 @@
 	echo PYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) >> $@
 	echo PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so >> $@
 	echo PYTHON_NUMARRAY_INCLUDE_DIR:PATH=/usr/include/$(PYVERS)/numarray >> $@
+	echo TCL_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) >> $@
+	echo TCL_LIBRARY:FILEPATH=/usr/lib/libtcl$(TCLVERS).so >> $@
+	echo TCL_TCLSH:FILEPATH=/usr/bin/tclsh$(TCLVERS) >> $@
+	echo TK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) >> $@
+	echo TK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so >> $@
 
 common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt
 	cd $(DEB_BUILDDIR) && cmake ..
 
 install/$(pkg_lib)::
-	dh_install -p$(pkg_lib) -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
+	dh_install -p$(pkg_lib) -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
 
 install/$(pkg_dev)::
 	dh_installman -p$(pkg_dev) debian/insighttoolkit.3
 	dh_installdocs -p$(pkg_dev) Documentation/*
-	dh_install -p$(pkg_dev) -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so usr/lib
+	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 
 
@@ -47,6 +56,12 @@
 	dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/*.py   $(PYMODDIR)
 	dh_pysupport -p$(pkg_python)
 
+install/$(pkg_tcl)::
+	mv debian/tmp/usr/lib/InsightToolkit/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)
+
 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