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

[Steven Michael Robbins]

Author: smr
Date: 2013-05-01 04:10:07 +0000 (Wed, 01 May 2013)
New Revision: 13456

Removed:
   trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Update to new upstream.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2013-05-01 04:06:45 UTC (rev 13455)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2013-05-01 04:10:07 UTC (rev 13456)
@@ -1,3 +1,10 @@
+insighttoolkit4 (4.3.2-1) unstable; urgency=low
+
+  * New upstream.
+    - patches/lsm-with-system-tiff.patch: Removed.  Applied upstream.
+
+ -- Steve M. Robbins <smr at debian.org>  Tue, 30 Apr 2013 23:09:50 -0500
+
 insighttoolkit4 (4.3.1-3) UNRELEASED; urgency=low
 
   * Remove obsolete DMUA flag

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch	2013-05-01 04:06:45 UTC (rev 13455)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/lsm-with-system-tiff.patch	2013-05-01 04:10:07 UTC (rev 13456)
@@ -1,28 +0,0 @@
-Description: Cannot use itkLSMImageIOFactory when using system TIFF
-Author: Paul Novotny <paul at paulnovo.us>
-Forwarded: http://review.source.kitware.com/9798
-
---- insighttoolkit4-4.3.1.orig/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
-+++ insighttoolkit4-4.3.1/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
-@@ -23,7 +23,10 @@
- #include "itkNiftiImageIOFactory.h"
- #include "itkGiplImageIOFactory.h"
- #include "itkJPEGImageIOFactory.h"
--#include "itkLSMImageIOFactory.h"
-+#include "itk_tiff.h" // ITK_USE_SYSTEM_TIFF
-+#ifndef ITK_USE_SYSTEM_TIFF
-+#  include "itkLSMImageIOFactory.h"
-+#endif // ITK_USE_SYSTEM_TIFF
- #include "itkMetaImageIOFactory.h"
- #include "itkPNGImageIOFactory.h"
- #include "itkNrrdImageIOFactory.h"
-@@ -43,7 +46,9 @@
-   itk::ObjectFactoryBase::RegisterFactory( itk::PNGImageIOFactory::New() );
-   itk::ObjectFactoryBase::RegisterFactory( itk::VTKImageIOFactory::New() );
-   itk::ObjectFactoryBase::RegisterFactory( itk::GiplImageIOFactory::New() );
-+#ifndef ITK_USE_SYSTEM_TIFF
-   itk::ObjectFactoryBase::RegisterFactory( itk::LSMImageIOFactory::New() );
-+#endif // ITK_USE_SYSTEM_TIFF
-   itk::ObjectFactoryBase::RegisterFactory( itk::NiftiImageIOFactory::New() );
-   itk::ObjectFactoryBase::RegisterFactory( itk::JPEGImageIOFactory::New() );
-   itk::ObjectFactoryBase::RegisterFactory( itk::TIFFImageIOFactory::New() );

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2013-05-01 04:06:45 UTC (rev 13455)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2013-05-01 04:10:07 UTC (rev 13456)
@@ -1,2 +1,2 @@
 bsd-hdf5.patch
-lsm-with-system-tiff.patch
+

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2013-05-01 04:06:45 UTC (rev 13455)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2013-05-01 04:10:07 UTC (rev 13456)
@@ -2,7 +2,6 @@
 
 VER_MAJOR = 4
 VER_MINOR = 3
-VER_PATCH = 1
 
 # TODO: turn on the following:
 #
@@ -43,7 +42,6 @@
 	-DBUILD_EXAMPLES:BOOL=ON \
 	-DBUILD_TESTING:BOOL=ON
 
-VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)
 
 pkg_lib = libinsighttoolkit$(SOVERSION)