[med-svn] r19702 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at moszumanska.debian.org
Fri Jul 24 21:32:00 UTC 2015
Author: smr
Date: 2015-07-24 21:32:00 +0000 (Fri, 24 Jul 2015)
New Revision: 19702
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0005-make-gdcm-helper-library-static.patch
trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch
trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
Log:
Remove obsolete patches.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2015-07-24 16:27:39 UTC (rev 19701)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2015-07-24 21:32:00 UTC (rev 19702)
@@ -5,9 +5,10 @@
* patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch:
* patches/vcl-dunno-about-this-gcc.patch: Remove. Applied upstream.
- * patches/0005-make-gdcm-helper-library-static.patch: Disabled at present.
+ * patches/0005-make-gdcm-helper-library-static.patch: Remove. Obsolete
+ because ITKGDCM library is no longer built when using system GDCM.
- -- Steve M. Robbins <smr at debian.org> Wed, 15 Jul 2015 22:05:23 -0500
+ -- Steve M. Robbins <smr at debian.org> Fri, 24 Jul 2015 16:28:06 -0500
insighttoolkit4 (4.7.2-2) unstable; urgency=medium
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch 2015-07-24 16:27:39 UTC (rev 19701)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0003_correct_bsplinecontrolpointimagefunction_pointtype.patch 2015-07-24 21:32:00 UTC (rev 19702)
@@ -1,18 +0,0 @@
-Description: Correct the type definition for the PointType to that it
- is the same like in the parent class.
- .
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Bug: https://issues.itk.org/jira/browse/ITK-3342
-Last-Update: 2015-01-21
-
---- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h
-+++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h
-@@ -86,7 +86,7 @@
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::RegionType RegionType;
- typedef typename InputImageType::IndexType IndexType;
-- typedef typename InputImageType::PointType PointType;
-+ typedef typename Superclass::PointType PointType;
- typedef typename InputImageType::RegionType InputImageRegionType;
-
- typedef typename InputImageType::SpacingType SpacingType;
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0005-make-gdcm-helper-library-static.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0005-make-gdcm-helper-library-static.patch 2015-07-24 16:27:39 UTC (rev 19701)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0005-make-gdcm-helper-library-static.patch 2015-07-24 21:32:00 UTC (rev 19702)
@@ -1,17 +0,0 @@
-Description: Make itk-gdcm library a static library if system gdcm is used
- In the case of using system gdcm this library is just an empty stub and by
- making it static a lintian warning is avoided
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
-
-diff --git a/Modules/ThirdParty/GDCM/src/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
-index e98077c..70f4286 100644
---- a/Modules/ThirdParty/GDCM/src/CMakeLists.txt
-+++ b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
-@@ -1,5 +1,5 @@
- if(ITK_USE_SYSTEM_GDCM)
-- add_library(ITKGDCM ITK-GDCM.cxx)
-+ add_library(ITKGDCM STATIC ITK-GDCM.cxx)
- target_link_libraries(ITKGDCM gdcmDICT gdcmMSFF)
- itk_module_target(ITKGDCM)
- return()
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch 2015-07-24 16:27:39 UTC (rev 19701)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/doubleconv.patch 2015-07-24 21:32:00 UTC (rev 19702)
@@ -1,16 +0,0 @@
-Description: Upstream provides an option to build against
- a system installed double conversion but it appears as
- broken at least on Debian
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/733629
-
---- insighttoolkit4-4.5.0.orig/Modules/Core/Common/src/CMakeLists.txt
-+++ insighttoolkit4-4.5.0/Modules/Core/Common/src/CMakeLists.txt
-@@ -108,6 +108,7 @@ endif()
- ### generating libraries
- add_library( ITKCommon ${ITK_LIBRARY_BUILD_TYPE} ${ITKCommon_SRCS})
-
-+include_directories( /usr/include/double-conversion )
- target_link_libraries(ITKCommon
- itksys
- ITKVNLInstantiation
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch 2015-07-24 16:27:39 UTC (rev 19701)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch 2015-07-24 21:32:00 UTC (rev 19702)
@@ -1,58 +0,0 @@
-From: Alexander Hewer <hewer at coli.uni-saarland.de>
-Date: Tue, 5 May 2015 08:45:33 +0000 (+0200)
-Subject: COMP: fixed error "Dunno about this gcc" for gcc 5.1
-X-Git-Tag: v4.8rc01~104^2
-X-Git-Url: http://itk.org/gitweb?p=ITK.git;a=commitdiff_plain;h=7f54e864;hp=8d58556089399c11d51795d46d6b17c355af95dc
-
-COMP: fixed error "Dunno about this gcc" for gcc 5.1
-
-Change-Id: I52f692b3e3e1aa01327cb6e184541526d2c824df
----
-
-diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-index 898ea3d..2d2d232 100644
---- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-@@ -101,6 +101,15 @@ int test_preprocessor_main(int /*argc*/,char* /*argv*/[])
- ++minor_count;
- #endif
-
-+#ifdef VCL_GCC_5
-+ ++major_count;
-+#endif
-+#ifdef VCL_GCC_50
-+ ++minor_count;
-+#endif
-+#ifdef VCL_GCC_51
-+ ++minor_count;
-+#endif
-
- #ifdef VCL_VC
- ++compiler_count;
-diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-index bad40b0..c6bcf84 100644
---- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-@@ -126,6 +126,13 @@
- # else
- # define VCL_GCC_40
- # endif
-+# elif (__GNUC__==5)
-+# define VCL_GCC_5
-+# if (__GNUC_MINOR__ > 0 )
-+# define VCL_GCC_51
-+# else
-+# define VCL_GCC_50
-+# endif
- # else
- # error "Dunno about this gcc"
- # endif
-@@ -245,7 +252,7 @@
-
- // This *needs* to come after vcl_config_headers.h
- #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
--# if defined(VCL_GCC_3) || defined(VCL_GCC_4)
-+# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5)
- # define GNU_LIBSTDCXX_V3 1
- # elif !defined(GNU_LIBSTDCXX_V3) && defined(VCL_GCC_295) && VCL_CXX_HAS_HEADER_ISTREAM
- // One difference between v2 and v3 is that the former has
More information about the debian-med-commit
mailing list