Author: smr Date: 2011-10-28 03:25:16 +0000 (Fri, 28 Oct 2011) New Revision: 8331
Removed: trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/patches/series trunk/packages/insighttoolkit/trunk/debian/rules Log: New upstream 3.20.1. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2011-10-28 03:05:49 UTC (rev 8330) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2011-10-28 03:25:16 UTC (rev 8331) @@ -1,3 +1,11 @@ +insighttoolkit (3.20.1-1) unstable; urgency=low + + * New upstream. + - patches/metaio-test-vtk_source.patch: + - patches/ptrdiff.patch: Remove. Applied upstream. + + -- Steve M. Robbins <[email protected]> Thu, 27 Oct 2011 22:24:59 -0500 + insighttoolkit (3.20.0-17) unstable; urgency=low * rules: Make example files permission fix conditional on installing Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch 2011-10-28 03:05:49 UTC (rev 8330) +++ trunk/packages/insighttoolkit/trunk/debian/patches/metaio-test-vtk_source.patch 2011-10-28 03:25:16 UTC (rev 8331) @@ -1,45 +0,0 @@ -Description: Use VTK_SOURCE_DIR to determine if MetaIO is built inside of VTK or ITK -Author: Stephen Aylward -Bug: 600677 - -Patch obtained from upstream git: - http://itk.org/gitweb?p=ITK.git;a=patch;h=93833edb2294c0190af9e6c0de26e9485399a7d3 - -From 93833edb2294c0190af9e6c0de26e9485399a7d3 Mon Sep 17 00:00:00 2001 -From: ITK Robot <[email protected]> -Date: Thu, 22 Jul 2010 10:54:04 -0400 -Subject: [PATCH] r2796 aylward | 2010-07-22T14:53:45.146190Z - BUG: Changed from VTK_VERSION to VTK_SOURCE_DIR to determine if being compiled within VTK or ITK. - ---- - Utilities/MetaIO/CMakeLists.txt | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - ---- insighttoolkit-3.20.0.orig/Utilities/MetaIO/CMakeLists.txt -+++ insighttoolkit-3.20.0/Utilities/MetaIO/CMakeLists.txt -@@ -9,11 +9,14 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # See the License for more information. - #============================================================================= --IF(VTK_VERSION) -+IF(VTK_SOURCE_DIR) -+ - SET(METAIO_FOR_VTK 1) - MARK_AS_ADVANCED( METAIO_FOR_VTK ) - SET(METAIO_NAMESPACE "vtkmetaio") --ELSE(VTK_VERSION) -+ -+ELSE(VTK_SOURCE_DIR) -+ - SET(METAIO_FOR_ITK 1) - MARK_AS_ADVANCED( METAIO_FOR_ITK ) - SET(METAIO_NAMESPACE "ITKMetaIO") -@@ -23,7 +26,7 @@ - INCLUDE_DIRECTORIES(${ITK_LIBXML2_INCLUDE_DIR}) - ENDIF(ITK_USE_LIBXML2) - --ENDIF(VTK_VERSION) -+ENDIF(VTK_SOURCE_DIR) - - PROJECT( ${METAIO_NAMESPACE} ) - Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch 2011-10-28 03:05:49 UTC (rev 8330) +++ trunk/packages/insighttoolkit/trunk/debian/patches/ptrdiff.patch 2011-10-28 03:25:16 UTC (rev 8331) @@ -1,32 +0,0 @@ ---- insighttoolkit-3.20.0.orig/Code/IO/itkConvertPixelBuffer.txx -+++ insighttoolkit-3.20.0/Code/IO/itkConvertPixelBuffer.txx -@@ -20,6 +20,8 @@ - - #include "itkRGBPixel.h" - -+#include <stddef.h> -+ - namespace itk - { - template < typename InputPixelType, ---- insighttoolkit-3.20.0.orig/Utilities/MetaIO/metaUtils.cxx -+++ insighttoolkit-3.20.0/Utilities/MetaIO/metaUtils.cxx -@@ -18,7 +18,7 @@ - - #include <stdio.h> - #include <ctype.h> -- -+#include <stddef.h> - #include <sys/stat.h> - #include <fcntl.h> - ---- insighttoolkit-3.20.0.orig/Code/IO/itkImageIORegion.h -+++ insighttoolkit-3.20.0/Code/IO/itkImageIORegion.h -@@ -17,6 +17,7 @@ - #ifndef __itkImageIORegion_h - #define __itkImageIORegion_h - -+#include <stddef.h> - #include <algorithm> - #include "itkRegion.h" - #include "itkObjectFactory.h" Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-10-28 03:05:49 UTC (rev 8330) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-10-28 03:25:16 UTC (rev 8331) @@ -1,4 +1,3 @@ -metaio-test-vtk_source.patch hppa-complex-long-double.patch 03_examples.patch tcl-install.patch @@ -8,4 +7,3 @@ wrapitk-externalprojects.patch add-registration-optimizers.patch wrap-iifilter-split.patch -ptrdiff.patch Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2011-10-28 03:05:49 UTC (rev 8330) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2011-10-28 03:25:16 UTC (rev 8331) @@ -2,7 +2,7 @@ VER_MAJOR = 3 VER_MINOR = 20 -VER_PATCH = 0 +VER_PATCH = 1 CMAKE_FLAGS = \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ @@ -49,7 +49,6 @@ pre-build: echo "Available disk space:" df -h . - test -d Code/Review || mv review Code/Review override_dh_auto_install: dh_auto_install @@ -57,11 +56,12 @@ debian/tmp/usr/lib/InsightToolkit/ITKLibraryDepends.cmake override_dh_lintian: + echo "$(pkg_dev): python-script-but-no-python-dep" > debian/$(pkg_dev).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_lib): embedded-library usr/lib/libitkjpeg8.so.$(VER_FULL): libjpeg" >> debian/$(pkg_lib).lintian-overrides + echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg12.so.$(VER_FULL): libjpeg" >> debian/$(pkg_lib).lintian-overrides + echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg16.so.$(VER_FULL): libjpeg" >> debian/$(pkg_lib).lintian-overrides + echo "$(pkg_lib): embedded-library usr/lib/libitkopenjpeg.so.$(VER_FULL): openjpeg" >> debian/$(pkg_lib).lintian-overrides dh_lintian override_dh_install: @@ -93,7 +93,6 @@ get-orig-source: $(UPSTREAM_SRC).tar.gz tar xzf $(UPSTREAM_SRC).tar.gz find $(UPSTREAM_SRC) -name CVS -o -name Patented | xargs rm -rf - rm -rf $(UPSTREAM_SRC)/Code/Review mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR) GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
