[med-svn] r16682 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Steven Michael Robbins
smr at moszumanska.debian.org
Sun Apr 13 12:32:33 UTC 2014
Author: smr
Date: 2014-04-13 12:32:32 +0000 (Sun, 13 Apr 2014)
New Revision: 16682
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Remove patches applied upstream.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,8 +1,14 @@
insighttoolkit4 (4.5.2-1) unstable; urgency=medium
* New upstream.
+
+ * patches/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch:
+ * patches/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch:
+ * patches/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch:
+ * patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch:
+ Remove; applied upstream.
- -- Steve M. Robbins <smr at debian.org> Sun, 13 Apr 2014 07:14:47 -0500
+ -- Steve M. Robbins <smr at debian.org> Sun, 13 Apr 2014 07:31:59 -0500
insighttoolkit4 (4.5.1-1) unstable; urgency=medium
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,50 +0,0 @@
-From d069b7b94287dae15fcaf707775f5dd2bbebcc38 Mon Sep 17 00:00:00 2001
-From: Matt McCormick <matt.mccormick at kitware.com>
-Date: Wed, 5 Feb 2014 15:52:34 -0500
-Subject: [PATCH 1/3] BUG: Wrap TransformFileReader, TransformFileWriter.
-
-Missing CMakeLists.txt in the wrapping directory. Need to explicitly include
-the headers after "Template" was appended to the class name.
-
-Suggested-by: Sami Koho <sami.koho at gmail.com>
-
-Change-Id: I6f994bb18f37d5adf1d0f0311fa73506c41239a7
----
- Modules/IO/TransformBase/wrapping/CMakeLists.txt | 3 +++
- Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap | 2 ++
- Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap | 2 ++
- 3 files changed, 7 insertions(+)
- create mode 100644 Modules/IO/TransformBase/wrapping/CMakeLists.txt
-
-diff --git a/Modules/IO/TransformBase/wrapping/CMakeLists.txt b/Modules/IO/TransformBase/wrapping/CMakeLists.txt
-new file mode 100644
-index 0000000..6072567
---- /dev/null
-+++ b/Modules/IO/TransformBase/wrapping/CMakeLists.txt
-@@ -0,0 +1,3 @@
-+itk_wrap_module(ITKIOTransformBase)
-+itk_auto_load_submodules()
-+itk_end_wrap_module()
-diff --git a/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap
-index 9b52fbc..662df9e 100644
---- a/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap
-+++ b/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap
-@@ -1,3 +1,5 @@
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkTransformFileReader.h")
- itk_wrap_class("itk::TransformFileReaderTemplate" POINTER)
- foreach(t ${WRAP_ITK_REAL})
- itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-diff --git a/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap
-index 4f1ac4a..356aaf3 100644
---- a/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap
-+++ b/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap
-@@ -1,3 +1,5 @@
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkTransformFileWriter.h")
- itk_wrap_class("itk::TransformFileWriterTemplate" POINTER)
- foreach(t ${WRAP_ITK_REAL})
- itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
---
-1.8.5.3
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,28 +0,0 @@
-From 66d2955fbe5528d9df216c639277d1d2686447e5 Mon Sep 17 00:00:00 2001
-From: Michka Popoff <michkapopoff at gmail.com>
-Date: Fri, 7 Feb 2014 19:24:49 +0100
-Subject: [PATCH 2/3] COMP: Fixed itkQuasiNewtonOptimizerv4 wrapping warnings
-
-The warning :
-/scratch/dashboards/Linux-x86_64-gcc4.4-WrapITK/ITK-build/Wrapping/Modules/ITKOptimizersv4/itkQuasiNewtonOptimizerv4.xml: warning(5): Unknown type type: itk::QuasiNewtonOptimizerv4 [typedef]
-/scratch/dashboards/Linux-x86_64-gcc4.4-WrapITK/ITK-build/Wrapping/Modules/ITKOptimizersv4/itkQuasiNewtonOptimizerv4.xml: warning(4): ITK type not wrapped, or currently not known: itk::QuasiNewtonOptimizerv4Template< double >
----
- .../Numerics/Optimizersv4/wrapping/itkQuasiNewtonOptimizerv4.wrap | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/Modules/Numerics/Optimizersv4/wrapping/itkQuasiNewtonOptimizerv4.wrap b/Modules/Numerics/Optimizersv4/wrapping/itkQuasiNewtonOptimizerv4.wrap
-index 4a43dd4..7eed11c 100644
---- a/Modules/Numerics/Optimizersv4/wrapping/itkQuasiNewtonOptimizerv4.wrap
-+++ b/Modules/Numerics/Optimizersv4/wrapping/itkQuasiNewtonOptimizerv4.wrap
-@@ -1 +1,7 @@
--itk_wrap_simple_class("itk::QuasiNewtonOptimizerv4" POINTER)
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkQuasiNewtonOptimizerv4.h")
-+itk_wrap_class("itk::QuasiNewtonOptimizerv4Template" POINTER)
-+ foreach(t ${WRAP_ITK_REAL})
-+ itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-+ endforeach(t)
-+itk_end_wrap_class()
---
-1.8.5.3
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,73 +0,0 @@
-From fced46ce8769b4edc7971ea0928045390b5c3f84 Mon Sep 17 00:00:00 2001
-From: Michka Popoff <michkapopoff at gmail.com>
-Date: Mon, 10 Feb 2014 09:41:42 +0100
-Subject: [PATCH 3/3] COMP: Fixed itkGradientDescentOptimizerv4 wrapping
- warnings
-
-I splitted the 3 wrapping calls in 3 separate files and fixed the wrapping.
-
-The warnings :
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(5): Unknown type type: itk::GradientDescentOptimizerBasev4 [typedef]
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(5): Unknown type type: itk::GradientDescentOptimizerv4 [typedef]
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(5): Unknown type type: itk::ObjectToObjectOptimizerBase [typedef]
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(4): ITK type not wrapped, or currently not known: itk::GradientDescentOptimizerBasev4Template< double >
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(4): ITK type not wrapped, or currently not known: itk::GradientDescentOptimizerv4Template< double >
-/home/kevin/kitware/ITK_Build/Wrapping/Modules/ITKOptimizersv4/itkGradientDescentOptimizerv4.xml: warning(4): ITK type not wrapped, or currently not known: itk::ObjectToObjectOptimizerBaseTemplate< double >
-
-Should also hopefully fix the new error on the dashboard I introduced by fixing the itkQuasiNewtonOptimizerv4 warnings (http://review.source.kitware.com/#/c/14317/)
-/home/kevin/kitware/ITK_Build/Wrapping/Typedefs/itkQuasiNewtonOptimizerv4.i:87: Warning 401: Nothing known about base class 'itk::GradientDescentOptimizerv4Template< float >'. Ignored.
-/home/kevin/kitware/ITK_Build/Wrapping/Typedefs/itkQuasiNewtonOptimizerv4.i:87: Warning 401: Maybe you forgot to instantiate 'itk::GradientDescentOptimizerv4Template< float >' using %template.
-
-Change-Id: I15b6af11690ed6efeaced68f73af5212ab5dc364
----
- .../wrapping/itkGradientDescentOptimizerBasev4.wrap | 7 +++++++
- .../Optimizersv4/wrapping/itkGradientDescentOptimizerv4.wrap | 10 +++++++---
- .../Optimizersv4/wrapping/itkObjectToObjectOptimizerBase.wrap | 7 +++++++
- 3 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerBasev4.wrap
- create mode 100644 Modules/Numerics/Optimizersv4/wrapping/itkObjectToObjectOptimizerBase.wrap
-
-diff --git a/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerBasev4.wrap b/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerBasev4.wrap
-new file mode 100644
-index 0000000..74f5a6c
---- /dev/null
-+++ b/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerBasev4.wrap
-@@ -0,0 +1,7 @@
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkGradientDescentOptimizerBasev4.h")
-+itk_wrap_class("itk::GradientDescentOptimizerBasev4Template" POINTER)
-+ foreach(t ${WRAP_ITK_REAL})
-+ itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-+ endforeach(t)
-+itk_end_wrap_class()
-diff --git a/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerv4.wrap b/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerv4.wrap
-index d53a176..3236448 100644
---- a/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerv4.wrap
-+++ b/Modules/Numerics/Optimizersv4/wrapping/itkGradientDescentOptimizerv4.wrap
-@@ -1,3 +1,7 @@
--itk_wrap_simple_class("itk::ObjectToObjectOptimizerBase" POINTER)
--itk_wrap_simple_class("itk::GradientDescentOptimizerBasev4" POINTER)
--itk_wrap_simple_class("itk::GradientDescentOptimizerv4" POINTER)
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkGradientDescentOptimizerv4.h")
-+itk_wrap_class("itk::GradientDescentOptimizerv4Template" POINTER)
-+ foreach(t ${WRAP_ITK_REAL})
-+ itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-+ endforeach(t)
-+itk_end_wrap_class()
-diff --git a/Modules/Numerics/Optimizersv4/wrapping/itkObjectToObjectOptimizerBase.wrap b/Modules/Numerics/Optimizersv4/wrapping/itkObjectToObjectOptimizerBase.wrap
-new file mode 100644
-index 0000000..61b2c44
---- /dev/null
-+++ b/Modules/Numerics/Optimizersv4/wrapping/itkObjectToObjectOptimizerBase.wrap
-@@ -0,0 +1,7 @@
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkObjectToObjectOptimizerBase.h")
-+itk_wrap_class("itk::ObjectToObjectOptimizerBaseTemplate" POINTER)
-+ foreach(t ${WRAP_ITK_REAL})
-+ itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-+ endforeach(t)
-+itk_end_wrap_class()
---
-1.8.5.3
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,30 +0,0 @@
-Author: Matt McCormick <matt.mccormick at kitware.com>
-Date: Thu Feb 6 10:26:49 2014 -0500
-
- COMP: Wrap OptimizerParameterScalesEstimatorTemplate.
-
- The class name changed and it became templated. Fixes:
-
- /playpen/blowekamp/MacOSX-WrapITK/ITK-build/Wrapping/Modules/ITKOptimizersv4/itkOptimizerParameterScalesEstimator.xml:
- warning(5): Unknown type type: itk::OptimizerParameterScalesEstimator
- [typedef]
- /playpen/blowekamp/MacOSX-WrapITK/ITK-build/Wrapping/Modules/ITKOptimizersv4/itkOptimizerParameterScalesEstimator.xml:
- warning(4): ITK type not wrapped, or currently not known:
- itk::OptimizerParameterScalesEstimatorTemplate< double >
-
- Change-Id: Ic6b4d6fba10d5d6c7b58de8d842bad6511e1ae7b
-
-diff --git a/Modules/Numerics/Optimizersv4/wrapping/itkOptimizerParameterScalesEstimator.wrap b/Modules/Numerics/Optimizersv4/wrapping/itkOptim
-index efd6a8c..a647ee4 100644
---- a/Modules/Numerics/Optimizersv4/wrapping/itkOptimizerParameterScalesEstimator.wrap
-+++ b/Modules/Numerics/Optimizersv4/wrapping/itkOptimizerParameterScalesEstimator.wrap
-@@ -1 +1,7 @@
--itk_wrap_simple_class("itk::OptimizerParameterScalesEstimator" POINTER)
-+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
-+itk_wrap_include("itkOptimizerParameterScalesEstimator.h")
-+itk_wrap_class("itk::OptimizerParameterScalesEstimatorTemplate" POINTER)
-+ foreach(t ${WRAP_ITK_REAL})
-+ itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
-+ endforeach(t)
-+itk_end_wrap_class()
-
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2014-04-13 12:15:54 UTC (rev 16681)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2014-04-13 12:32:32 UTC (rev 16682)
@@ -1,8 +1,3 @@
nrrdio-linking.patch
bsd-hdf5.patch
-#doubleconv.patch
-0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch
-0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch
-0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch
-0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch
0005-make-gdcm-helper-library-static.patch
More information about the debian-med-commit
mailing list