This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit 2cc133e54b4e3f4af863b38c7904991eb4dbb741 Author: Bas Couwenberg <[email protected]> Date: Mon Feb 15 18:48:13 2016 +0100 Mark itk-4.8-4.9.patch as Applied-Upstream. --- debian/patches/itk-4.8-4.9.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/patches/itk-4.8-4.9.patch b/debian/patches/itk-4.8-4.9.patch index 2ed0984..8a00f07 100644 --- a/debian/patches/itk-4.8-4.9.patch +++ b/debian/patches/itk-4.8-4.9.patch @@ -1,13 +1,16 @@ Description: Support both ITK 4.8 and ITK 4.9. Author: Bas Couwenberg <[email protected]> Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142 +Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commit/e0884b46344bd3a25e12c55ade5fc8655d3b7153 --- a/Modules/Core/Common/include/otbConfigurationManager.h +++ b/Modules/Core/Common/include/otbConfigurationManager.h -@@ -18,7 +18,11 @@ +@@ -18,7 +18,13 @@ #ifndef _otbConfigurationManager_h #define _otbConfigurationManager_h ++#include "itkVersion.h" ++ +#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8) +#include "itksys/FundamentalType.h" +#else @@ -16,7 +19,7 @@ Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142 #include <string> #include <boost/cstdint.hpp> -@@ -38,7 +42,11 @@ namespace otb +@@ -38,7 +44,11 @@ namespace otb class ConfigurationManager { public: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
