This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit 79038e3161485b782f4b1aedfb022539afc5ac68 Author: Bas Couwenberg <[email protected]> Date: Thu Oct 20 12:19:55 2016 +0200 Disable OpenCV support, FTBFS with 3.1. --- debian/changelog | 1 + debian/control | 2 -- debian/control.in | 2 -- debian/rules | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e86164c..e4a0405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ otb (5.6.1+dfsg-2) UNRELEASED; urgency=medium * Team upload. * Add libcurl-ssl-dev as alternative to libcurl4-gnutls-dev dependency. * Add patch to fix spelling errors. + * Disable OpenCV support, FTBFS with 3.1. -- Bas Couwenberg <[email protected]> Tue, 30 Aug 2016 13:21:46 +0200 diff --git a/debian/control b/debian/control index f0ff4cc..f0a110e 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,6 @@ Build-Depends: debhelper (>= 9), libpng-dev, libproj-dev, libtool, - libopencv-dev, libopenthreads-dev, libossim-dev, libqt4-dev, @@ -51,7 +50,6 @@ Depends: cmake (>= 2.8.3), libinsighttoolkit4-dev, libkml-dev, libmuparser-dev, - libopencv-dev, libopenthreads-dev, libossim-dev, libotbapplicationengine-5.6-1 (= ${binary:Version}), diff --git a/debian/control.in b/debian/control.in index 6fabe6b..177617a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,6 @@ Build-Depends: debhelper (>= 9), libpng-dev, libproj-dev, libtool, - libopencv-dev, libopenthreads-dev, libossim-dev, libqt4-dev, @@ -51,7 +50,6 @@ Depends: cmake (>= 2.8.3), libinsighttoolkit4-dev, libkml-dev, libmuparser-dev, - libopencv-dev, libopenthreads-dev, libossim-dev, libotbapplicationengine-@SOVERSION@ (= ${binary:Version}), diff --git a/debian/rules b/debian/rules index 5f2ee87..5af3ac4 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ CMAKE_FLAGS = \ -DOTB_USE_LIBKML:BOOL=ON \ -DOTB_USE_MUPARSER:BOOL=ON \ -DOTB_USE_QT4:BOOL=ON \ - -DOTB_USE_OPENCV:BOOL=ON \ + -DOTB_USE_OPENCV:BOOL=OFF \ -DOTB_USE_OPENGL:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DOTB_WRAP_PYTHON:BOOL=ON \ -- 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
