[otb] 04/13: Re-enable OpenCV support, 3.1 should be supported now.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository otb.

commit 1e9ffede05368b88bf81c0bea44ecd8d9bc50cd5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 13 10:09:59 2017 +0200

    Re-enable OpenCV support, 3.1 should be supported now.
---
 debian/changelog  | 1 +
 debian/control    | 2 ++
 debian/control.in | 2 ++
 debian/rules      | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3ceeed4..8594618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ otb (6.0.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Re-enable OpenCV support, 3.1 should be supported now.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 13 May 2017 09:40:57 +0200
 
diff --git a/debian/control b/debian/control
index 261c1c4..8493281 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
                libinsighttoolkit4-dev,
                libkml-dev,
                libmuparser-dev,
+               libopencv-dev,
                libopenthreads-dev,
                libossim-dev,
                libpng-dev,
@@ -53,6 +54,7 @@ Depends: cmake (>= 2.8.3),
          libinsighttoolkit4-dev,
          libkml-dev,
          libmuparser-dev,
+         libopencv-dev,
          libopenthreads-dev,
          libossim-dev,
          libotbapplicationengine-6.0-1 (= ${binary:Version}),
diff --git a/debian/control.in b/debian/control.in
index c2e0d4d..8765efb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
                libinsighttoolkit4-dev,
                libkml-dev,
                libmuparser-dev,
+               libopencv-dev,
                libopenthreads-dev,
                libossim-dev,
                libpng-dev,
@@ -53,6 +54,7 @@ Depends: cmake (>= 2.8.3),
          libinsighttoolkit4-dev,
          libkml-dev,
          libmuparser-dev,
+         libopencv-dev,
          libopenthreads-dev,
          libossim-dev,
          libotbapplicationengine- at SOVERSION@ (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 2d2e5de..9cfe9fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ CMAKE_FLAGS = \
 	-DOTB_USE_MAPNIK:BOOL=OFF \
 	-DOTB_USE_MUPARSER:BOOL=ON \
 	-DOTB_USE_MUPARSERX:BOOL=OFF \
-	-DOTB_USE_OPENCV:BOOL=OFF \
+	-DOTB_USE_OPENCV:BOOL=ON \
 	-DOTB_USE_OPENGL:BOOL=ON \
 	-DOTB_USE_QT4:BOOL=ON \
 	-DOTB_USE_QWT:BOOL=ON \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git