Author: smr Date: 2010-04-11 15:11:40 +0000 (Sun, 11 Apr 2010) New Revision: 4723
Added: trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch 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/patches/series trunk/packages/insighttoolkit/trunk/debian/rules Log: Build depend on javahelper, use jh_installlibs to install the jar file. New patch itkTkImageViewer2D.patch to fix build for Tcl 8.5. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-04-10 14:38:37 UTC (rev 4722) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-04-11 15:11:40 UTC (rev 4723) @@ -1,10 +1,16 @@ insighttoolkit (3.16.0-2) unstable; urgency=low * Add Java bindings (thanks, Michal Suchanek). Closes: #572132. + Build-depend on default-jdk and javahelper (>= 0.18 to use CDBS + class). * Build with Tcl version 8.5. Closes: #572131. + * patches/itkTkImageViewer2D.patch: New. Patch to build with tcl 8.5. + + * control.in: New packages libinsighttoolkit3-java and + libinsighttoolkit3-jni. - -- Steve M. Robbins <[email protected]> Mon, 05 Apr 2010 01:44:23 -0500 + -- Steve M. Robbins <[email protected]> Sat, 10 Apr 2010 23:24:23 -0500 insighttoolkit (3.16.0-1) unstable; urgency=low Modified: trunk/packages/insighttoolkit/trunk/debian/control =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/control 2010-04-10 14:38:37 UTC (rev 4722) +++ trunk/packages/insighttoolkit/trunk/debian/control 2010-04-11 15:11:40 UTC (rev 4723) @@ -11,7 +11,7 @@ tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev, libfreetype6-dev, libopenjpeg-dev, graphviz, libxext-dev, libxss-dev, libxft-dev, libpoppler-dev, libssl-dev, - default-jdk (>= 1.6-34) + default-jdk (>= 1.6-34), javahelper (>= 0.18) 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 @@ -37,7 +37,7 @@ Package: libinsighttoolkit3-java Section: java Architecture: all -Depends: ${misc:Depends}, libinsighttoolkit3-jni, java2-runtime +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 Modified: trunk/packages/insighttoolkit/trunk/debian/control.in =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/control.in 2010-04-10 14:38:37 UTC (rev 4722) +++ trunk/packages/insighttoolkit/trunk/debian/control.in 2010-04-11 15:11:40 UTC (rev 4723) @@ -11,7 +11,7 @@ tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev, libfreetype6-dev, libopenjpeg-dev, graphviz, libxext-dev, libxss-dev, libxft-dev, libpoppler-dev, libssl-dev, - default-jdk (>= 1.6-34) + default-jdk (>= 1.6-34), javahelper (>= 0.18) 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 @@ -37,7 +37,7 @@ Package: libinsighttool...@ver_major@-java Section: java Architecture: all -Depends: ${misc:Depends}, libinsighttool...@ver_major@-jni, java2-runtime +Depends: ${java:Depends}, ${misc:Depends}, libinsighttool...@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 Added: trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch (rev 0) +++ trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch 2010-04-11 15:11:40 UTC (rev 4723) @@ -0,0 +1,20 @@ +--- insighttoolkit-3.16.0.orig/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx.orig 2010-04-10 21:22:04.000000000 -0500 ++++ insighttoolkit-3.16.0/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx 2010-04-10 23:13:16.000000000 -0500 +@@ -114,7 +114,7 @@ + // Setup the size + Tk_PhotoHandle photo = + Tk_FindPhoto(m_Interpreter, const_cast<char*>(m_ImageName.c_str())); +- Tk_PhotoSetSize(photo, width, height); ++ Tk_PhotoSetSize(m_Interpreter, photo, width, height); + + OStringStream command; + command << m_CanvasName.c_str() << " configure -scrollregion \"1 1 " +@@ -142,7 +142,7 @@ + #if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 4) + Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1]); + #else +- Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1], ++ Tk_PhotoPutBlock(m_Interpreter, photo, &block, 0, 0, size[0], size[1], + TK_PHOTO_COMPOSITE_SET); + #endif + } Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-04-10 14:38:37 UTC (rev 4722) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-04-11 15:11:40 UTC (rev 4723) @@ -2,3 +2,4 @@ 03_examples.patch tcl-install.patch use_system_vxl.patch +itkTkImageViewer2D.patch Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2010-04-10 14:38:37 UTC (rev 4722) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2010-04-11 15:11:40 UTC (rev 4723) @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/javahelper.mk VER_MAJOR = 3 VER_MINOR = 16 @@ -83,7 +84,7 @@ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake install/$(pkg_java):: - dh_install -p$(pkg_java) debian/tmp/usr/lib/InsightToolkit/*.jar usr/share/java + jh_installlibs -p$(pkg_java) debian/tmp/usr/lib/InsightToolkit/*.jar install/$(pkg_jni):: dh_install -p$(pkg_jni) debian/tmp/usr/lib/InsightToolkit/*Java.so* usr/lib/jni _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
