[med-svn] r5083 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Sun Aug 1 04:22:38 UTC 2010
Author: smr
Date: 2010-08-01 04:22:32 +0000 (Sun, 01 Aug 2010)
New Revision: 5083
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch
trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.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:
Minimal changes to get 3.20.0 to compile.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-08-01 04:22:32 UTC (rev 5083)
@@ -1,3 +1,17 @@
+insighttoolkit (3.20.0-1) unstable; urgency=low
+
+ * New upstream.
+ - patches/itkTkImageViewer2D.patch: Remove. Applied upstream.
+ - patches/nifti-memleak.patch: Remove. Applied upstream.
+
+ * control.in: Adjust gccxml version dependency to match what used to be
+ in control.
+
+ * rules: Set version variables to 3.20.
+ * control: Re-generate for libinsighttoolkit3.20.
+
+ -- Steve M. Robbins <smr at debian.org> Sat, 31 Jul 2010 15:48:17 -0500
+
insighttoolkit (3.18.0-4) unstable; urgency=low
* rules: Use cmake.mk instead of makefile.mk; drop common-configure-arch
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2010-08-01 04:22:32 UTC (rev 5083)
@@ -17,7 +17,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/
-Package: libinsighttoolkit3.18
+Package: libinsighttoolkit3.20
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -110,7 +110,7 @@
Package: libinsighttoolkit3-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libinsighttoolkit3.18 (= ${binary:Version})
+Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version})
Recommends: libfftw3-dev, uuid-dev
Conflicts: libinsighttoolkit-dev
Replaces: libinsighttoolkit-dev
Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in 2010-08-01 04:22:32 UTC (rev 5083)
@@ -5,7 +5,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Steve M. Robbins <smr at debian.org>
Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7),
- cmake, cableswig (>= 0.1.0+cvs20100501), gccxml (>= 0.9.0+cvs20100501),
+ cmake, cableswig (>= 0.1.0+cvs20100501), gccxml (>= 0.9.0+cvs20100501-2),
zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3),
python-support (>= 0.6.4), python-dev, libfftw3-dev,
tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev,
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itkTkImageViewer2D.patch 2010-08-01 04:22:32 UTC (rev 5083)
@@ -1,34 +0,0 @@
-Reported upstream: http://public.kitware.com/Bug/view.php?id=10532
-
---- insighttoolkit-3.18.0.orig/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
-+++ insighttoolkit-3.18.0/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
-@@ -114,8 +114,14 @@
- // Setup the size
- Tk_PhotoHandle photo =
- Tk_FindPhoto(m_Interpreter, const_cast<char*>(m_ImageName.c_str()));
-+
-+
-+#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 5)
- Tk_PhotoSetSize(photo, width, height);
--
-+#else
-+ Tk_PhotoSetSize(m_Interpreter, photo, width, height);
-+#endif
-+
- OStringStream command;
- command << m_CanvasName.c_str() << " configure -scrollregion \"1 1 "
- << width << " " << height << "\"";
-@@ -142,8 +148,13 @@
- #if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 4)
- Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1]);
- #else
-+#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 5)
- Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1],
- TK_PHOTO_COMPOSITE_SET);
-+#else
-+ Tk_PhotoPutBlock(m_Interpreter, photo, &block, 0, 0, size[0], size[1],
-+ TK_PHOTO_COMPOSITE_SET);
-+#endif
- #endif
- }
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch 2010-08-01 04:22:32 UTC (rev 5083)
@@ -1,31 +0,0 @@
-Description: Avoid memory leak. Patch taken from upstream CVS.
-Author: Yaroslav Halchenko <debian at onerussian.com>
-Bug: 587200
-Forwarded: http://public.kitware.com/Bug/view.php?id=10899
-
---- insighttoolkit-3.18.0.orig/Code/IO/itkNiftiImageIO.cxx
-+++ insighttoolkit-3.18.0/Code/IO/itkNiftiImageIO.cxx
-@@ -3,8 +3,8 @@
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkNiftiImageIO.cxx,v $
- Language: C++
-- Date: $Date: 2009-11-22 13:33:11 $
-- Version: $Revision: 1.87 $
-+ Date: $Date: 2010-07-12 16:02:48 $
-+ Version: $Revision: 1.88 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-@@ -456,7 +456,11 @@
- // sizes = x y z t vecsize
- _size[4] = numComponents;
- }
--
-+ // Free memory if any was occupied already (incase of re-using the IO filter).
-+ if (this->m_NiftiImage != NULL)
-+ {
-+ nifti_image_free(this->m_NiftiImage);
-+ }
- //
- // allocate nifti image...
- this->m_NiftiImage = nifti_image_read(this->GetFileName(),false);
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-08-01 04:22:32 UTC (rev 5083)
@@ -2,7 +2,5 @@
gccxml-workaround.patch
03_examples.patch
tcl-install.patch
-itkTkImageViewer2D.patch
jni-dir.patch
remove-cmake-export-build-settings.patch
-nifti-memleak.patch
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2010-07-31 20:14:53 UTC (rev 5082)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2010-08-01 04:22:32 UTC (rev 5083)
@@ -6,7 +6,7 @@
include /usr/share/cdbs/1/class/javahelper.mk
VER_MAJOR = 3
-VER_MINOR = 18
+VER_MINOR = 20
VER_PATCH = 0
PYVERS = $(shell pyversions -r debian/control)
More information about the debian-med-commit
mailing list